2.6.37-stable review patch. If anyone has any objections, please let us know.
------------------ From: Ian Abbott <[email protected]> commit 3c323c01b6bd5fd01be21a8f0cdc11e55997aa06 upstream. As mentioned by W. Trevor King on the [email protected] list on "Thu, 27 Jan 2011 18:52:15 -0500", "Message-ID: <[email protected]>", the ni_pcimio module is missing module metadata, including a license. This patch adds module metadata to all the NI comedi driver modules. It also removes a duplicate MODULE_LICENSE("GPL") line from the "mite" module. Signed-off-by: Ian Abbott <[email protected]> Cc: W. Trevor King <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]> --- drivers/staging/comedi/drivers/mite.c | 2 -- drivers/staging/comedi/drivers/ni_6527.c | 4 ++++ drivers/staging/comedi/drivers/ni_65xx.c | 4 ++++ drivers/staging/comedi/drivers/ni_660x.c | 4 ++++ drivers/staging/comedi/drivers/ni_670x.c | 4 ++++ drivers/staging/comedi/drivers/ni_pcidio.c | 4 ++++ drivers/staging/comedi/drivers/ni_pcimio.c | 4 ++++ 7 files changed, 24 insertions(+), 2 deletions(-) --- a/drivers/staging/comedi/drivers/mite.c +++ b/drivers/staging/comedi/drivers/mite.c @@ -61,8 +61,6 @@ #define PCI_DAQ_SIZE 4096 #define PCI_DAQ_SIZE_660X 8192 -MODULE_LICENSE("GPL"); - struct mite_struct *mite_devices; EXPORT_SYMBOL(mite_devices); --- a/drivers/staging/comedi/drivers/ni_6527.c +++ b/drivers/staging/comedi/drivers/ni_6527.c @@ -527,3 +527,7 @@ static void __exit driver_ni6527_cleanup module_init(driver_ni6527_init_module); module_exit(driver_ni6527_cleanup_module); + +MODULE_AUTHOR("Comedi http://www.comedi.org";); +MODULE_DESCRIPTION("Comedi low-level driver"); +MODULE_LICENSE("GPL"); --- a/drivers/staging/comedi/drivers/ni_65xx.c +++ b/drivers/staging/comedi/drivers/ni_65xx.c @@ -871,3 +871,7 @@ static void __exit driver_ni_65xx_cleanu module_init(driver_ni_65xx_init_module); module_exit(driver_ni_65xx_cleanup_module); + +MODULE_AUTHOR("Comedi http://www.comedi.org";); +MODULE_DESCRIPTION("Comedi low-level driver"); +MODULE_LICENSE("GPL"); --- a/drivers/staging/comedi/drivers/ni_660x.c +++ b/drivers/staging/comedi/drivers/ni_660x.c @@ -1421,3 +1421,7 @@ static int ni_660x_dio_insn_config(struc }; return 0; } + +MODULE_AUTHOR("Comedi http://www.comedi.org";); +MODULE_DESCRIPTION("Comedi low-level driver"); +MODULE_LICENSE("GPL"); --- a/drivers/staging/comedi/drivers/ni_670x.c +++ b/drivers/staging/comedi/drivers/ni_670x.c @@ -384,3 +384,7 @@ static int ni_670x_find_device(struct co mite_list_devices(); return -EIO; } + +MODULE_AUTHOR("Comedi http://www.comedi.org";); +MODULE_DESCRIPTION("Comedi low-level driver"); +MODULE_LICENSE("GPL"); --- a/drivers/staging/comedi/drivers/ni_pcidio.c +++ b/drivers/staging/comedi/drivers/ni_pcidio.c @@ -1354,3 +1354,7 @@ static void __exit driver_pcidio_cleanup module_init(driver_pcidio_init_module); module_exit(driver_pcidio_cleanup_module); + +MODULE_AUTHOR("Comedi http://www.comedi.org";); +MODULE_DESCRIPTION("Comedi low-level driver"); +MODULE_LICENSE("GPL"); --- a/drivers/staging/comedi/drivers/ni_pcimio.c +++ b/drivers/staging/comedi/drivers/ni_pcimio.c @@ -1853,3 +1853,7 @@ static int pcimio_dio_change(struct come return 0; } + +MODULE_AUTHOR("Comedi http://www.comedi.org";); +MODULE_DESCRIPTION("Comedi low-level driver"); +MODULE_LICENSE("GPL"); _______________________________________________ stable mailing list [email protected] http://linux.kernel.org/mailman/listinfo/stable
