[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

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");
+

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");

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
 

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         

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");

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.

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]