[PATCH] Various trivial module related fixes.

More bits from 2.5.39-dj sucked out by Adrian Bunk.

 - drivers/char/toshiba.c: add
   MODULE_{PARM_DESC,AUTHOR,DESCRIPTION,SUPPORTED_DEVICE}
 - drivers/mtd/nand/nand_ecc.c: add MODULE_{AUTHOR,DESCRIPTION}
 - drivers/net/skfp/skfddi.c: add MODULE_AUTHOR
 - drivers/net/tokenring/olympic.c: remove "\n" at the end of
   MODULE_DESCRIPTION
 - fs/driverfs/inode.c: add MODULE_LICENSE
 - fs/nls/nls_cp1250.c: correct MODULE_LICENSE
 - include/linux/module.h: add "GPL v2" to the list of free software
   licenses

diff --git a/drivers/char/toshiba.c b/drivers/char/toshiba.c
index 71b2cf809c3eb456d5ec7d235d21c9050fdcaf09..187c78b64fa3e55a6a8649a922faed78c2de8df5 100644 (file)
--- a/drivers/char/toshiba.c
+++ b/drivers/char/toshiba.c
@@ -84,8 +84,6 @@ static int tosh_fn = 0;
 
 MODULE_PARM(tosh_fn, "i");
 
-MODULE_LICENSE("GPL");
-
 
 static int tosh_get_info(char *, char **, off_t, int);
 static int tosh_ioctl(struct inode *, struct file *, unsigned int,
@@ -517,3 +515,10 @@ void cleanup_module(void)
        misc_deregister(&tosh_device);
 }
 #endif
+
+MODULE_LICENSE("GPL");
+MODULE_PARM_DESC(tosh_fn, "User specified Fn key detection port");
+MODULE_AUTHOR("Jonathan Buzzard <jonathan@buzzard.org.uk>");
+MODULE_DESCRIPTION("Toshiba laptop SMM driver");
+MODULE_SUPPORTED_DEVICE("toshiba");
+

diff --git a/drivers/mtd/nand/nand_ecc.c b/drivers/mtd/nand/nand_ecc.c
index 419352a59a9a39b74b718f460e356b1f874b2de1..c4723d6b9a91ef4560ea02bff1ad4eb70dfc2981 100644 (file)
--- a/drivers/mtd/nand/nand_ecc.c
+++ b/drivers/mtd/nand/nand_ecc.c
@@ -209,3 +209,5 @@ EXPORT_SYMBOL(nand_calculate_ecc);
 EXPORT_SYMBOL(nand_correct_data);
 
 MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Steven J. Hill <sjhill@cotw.com>");
+MODULE_DESCRIPTION("Generic NAND ECC support");

diff --git a/drivers/net/skfp/skfddi.c b/drivers/net/skfp/skfddi.c
index 6b67bce267b8744a952d70a1e092f3385498d758..46c165dc05c247971987125ca1a3532bab03c1b1 100644 (file)
--- a/drivers/net/skfp/skfddi.c
+++ b/drivers/net/skfp/skfddi.c
@@ -188,6 +188,7 @@ static struct pci_device_id skfddi_pci_tbl[] __initdata = {
 };
 MODULE_DEVICE_TABLE(pci, skfddi_pci_tbl);
 MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Mirko Lindner <mlindner@syskonnect.de>");
 
 // Define module-wide (static) variables
 

diff --git a/drivers/net/tokenring/olympic.c b/drivers/net/tokenring/olympic.c
index 9eaf6ccdd9529203b49264b4b8c18a5ca7e539cd..ea19b98b26133c33fcf0230d44e8fff9b75a520b 100644 (file)
--- a/drivers/net/tokenring/olympic.c
+++ b/drivers/net/tokenring/olympic.c
@@ -128,7 +128,7 @@ static char *open_min_error[] = {"No error", "Function Failure", "Signal Lost",
 /* Module paramters */
 
 MODULE_AUTHOR("Mike Phillips <mikep@linuxtr.net>") ; 
-MODULE_DESCRIPTION("Olympic PCI/Cardbus Chipset Driver \n") ; 
+MODULE_DESCRIPTION("Olympic PCI/Cardbus Chipset Driver") ; 
 
 /* Ring Speed 0,4,16,100 
  * 0 = Autosense         

diff --git a/fs/driverfs/inode.c b/fs/driverfs/inode.c
index af1ed60b5646e347bed37da69c1b3789f23df715..0f35e27e669ca3b8d2df8cc8464359f06607d197 100644 (file)
--- a/fs/driverfs/inode.c
+++ b/fs/driverfs/inode.c
@@ -703,3 +703,4 @@ EXPORT_SYMBOL(driverfs_create_symlink);
 EXPORT_SYMBOL(driverfs_create_dir);
 EXPORT_SYMBOL(driverfs_remove_file);
 EXPORT_SYMBOL(driverfs_remove_dir);
+MODULE_LICENSE("GPL");

diff --git a/fs/nls/nls_cp1250.c b/fs/nls/nls_cp1250.c
index afae07580e353d970fa9ac8d2263d3cfd51e9427..982dc66a5227d4ab2849c5935d9592f63f106fd0 100644 (file)
--- a/fs/nls/nls_cp1250.c
+++ b/fs/nls/nls_cp1250.c
@@ -344,7 +344,7 @@ static void __exit exit_nls_cp1250(void)
 module_init(init_nls_cp1250)
 module_exit(exit_nls_cp1250)
 
-MODULE_LICENSE("BSD without advertising clause");
+MODULE_LICENSE("Dual BSD/GPL");
 
 /*
  * Overrides for Emacs so that we follow Linus's tabbing style.

diff --git a/include/linux/module.h b/include/linux/module.h
index c71778e385362b269ea433aa4b2eee0601a3c9fa..4dc669b060fb6df55ce19ea3e6ff5e16b0ddd667 100644 (file)
--- a/include/linux/module.h
+++ b/include/linux/module.h
@@ -253,6 +253,7 @@ static const struct gtype##_id * __module_##gtype##_table \
  * software modules
  *
  *     "GPL"                           [GNU Public License v2 or later]
+ *     "GPL v2"                        [GNU Public License v2]
  *     "GPL and additional rights"     [GNU Public License v2 rights and more]
  *     "Dual BSD/GPL"                  [GNU Public License v2 or BSD license choice]
  *     "Dual MPL/GPL"                  [GNU Public License v2 or Mozilla license choice]