diff options
author | Alexey Dobriyan <adobriyan@gmail.com> | 2008-04-28 05:15:32 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-28 11:58:40 -0400 |
commit | affc23d11631a47d35dfd552ded8ca255c001490 (patch) | |
tree | 0d03e6ccc5c8f7ef22e6e340c9323ea1f199f99b | |
parent | 3553a2fa8cbfc9f85f1809366be5884054f52c6d (diff) |
fbdev: nv: drop useless MODULE ifdefs
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Cc: Antonino A. Daplas <adaplas@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | drivers/video/nvidia/nvidia.c | 3 | ||||
-rw-r--r-- | drivers/video/riva/fbdev.c | 2 |
2 files changed, 0 insertions, 5 deletions
diff --git a/drivers/video/nvidia/nvidia.c b/drivers/video/nvidia/nvidia.c index 596652d2831f..4f46e9cf8cca 100644 --- a/drivers/video/nvidia/nvidia.c +++ b/drivers/video/nvidia/nvidia.c | |||
@@ -1559,7 +1559,6 @@ static int __devinit nvidiafb_init(void) | |||
1559 | 1559 | ||
1560 | module_init(nvidiafb_init); | 1560 | module_init(nvidiafb_init); |
1561 | 1561 | ||
1562 | #ifdef MODULE | ||
1563 | static void __exit nvidiafb_exit(void) | 1562 | static void __exit nvidiafb_exit(void) |
1564 | { | 1563 | { |
1565 | pci_unregister_driver(&nvidiafb_driver); | 1564 | pci_unregister_driver(&nvidiafb_driver); |
@@ -1615,5 +1614,3 @@ MODULE_PARM_DESC(nomtrr, "Disables MTRR support (0 or 1=disabled) " | |||
1615 | MODULE_AUTHOR("Antonino Daplas"); | 1614 | MODULE_AUTHOR("Antonino Daplas"); |
1616 | MODULE_DESCRIPTION("Framebuffer driver for nVidia graphics chipset"); | 1615 | MODULE_DESCRIPTION("Framebuffer driver for nVidia graphics chipset"); |
1617 | MODULE_LICENSE("GPL"); | 1616 | MODULE_LICENSE("GPL"); |
1618 | #endif /* MODULE */ | ||
1619 | |||
diff --git a/drivers/video/riva/fbdev.c b/drivers/video/riva/fbdev.c index 5c47968e7f21..46a9237a11e4 100644 --- a/drivers/video/riva/fbdev.c +++ b/drivers/video/riva/fbdev.c | |||
@@ -2213,14 +2213,12 @@ static int __devinit rivafb_init(void) | |||
2213 | 2213 | ||
2214 | module_init(rivafb_init); | 2214 | module_init(rivafb_init); |
2215 | 2215 | ||
2216 | #ifdef MODULE | ||
2217 | static void __exit rivafb_exit(void) | 2216 | static void __exit rivafb_exit(void) |
2218 | { | 2217 | { |
2219 | pci_unregister_driver(&rivafb_driver); | 2218 | pci_unregister_driver(&rivafb_driver); |
2220 | } | 2219 | } |
2221 | 2220 | ||
2222 | module_exit(rivafb_exit); | 2221 | module_exit(rivafb_exit); |
2223 | #endif /* MODULE */ | ||
2224 | 2222 | ||
2225 | module_param(noaccel, bool, 0); | 2223 | module_param(noaccel, bool, 0); |
2226 | MODULE_PARM_DESC(noaccel, "bool: disable acceleration"); | 2224 | MODULE_PARM_DESC(noaccel, "bool: disable acceleration"); |