diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-24 04:57:43 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-24 04:57:43 -0500 |
| commit | 5a05a6d7a51bcc47c5c6f0ed68e433f9a01afd89 (patch) | |
| tree | d283eb52fda7b5db060514599259e568abfd97ac /drivers | |
| parent | d20761a7995773dfae4a54fdd26a7857b861adb5 (diff) | |
| parent | 577d6a7c3a0e273e115c65a148b71be6c1950f69 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
module: fix missing semicolons in MODULE macro usage
param: add null statement to compiled-in module params
module: fix linker error for MODULE_VERSION when !MODULE and CONFIG_SYSFS=n
module: show version information for built-in modules in sysfs
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/arm/ks8695net.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/arm/ks8695net.c b/drivers/net/arm/ks8695net.c index 62d6f88cbab5..aa07657744c3 100644 --- a/drivers/net/arm/ks8695net.c +++ b/drivers/net/arm/ks8695net.c | |||
| @@ -1644,7 +1644,7 @@ ks8695_cleanup(void) | |||
| 1644 | module_init(ks8695_init); | 1644 | module_init(ks8695_init); |
| 1645 | module_exit(ks8695_cleanup); | 1645 | module_exit(ks8695_cleanup); |
| 1646 | 1646 | ||
| 1647 | MODULE_AUTHOR("Simtec Electronics") | 1647 | MODULE_AUTHOR("Simtec Electronics"); |
| 1648 | MODULE_DESCRIPTION("Micrel KS8695 (Centaur) Ethernet driver"); | 1648 | MODULE_DESCRIPTION("Micrel KS8695 (Centaur) Ethernet driver"); |
| 1649 | MODULE_LICENSE("GPL"); | 1649 | MODULE_LICENSE("GPL"); |
| 1650 | MODULE_ALIAS("platform:" MODULENAME); | 1650 | MODULE_ALIAS("platform:" MODULENAME); |