From: Alexey Dobriyan Signed-off-by: Alexey Dobriyan Cc: Antonino A. Daplas Signed-off-by: Andrew Morton --- drivers/video/nvidia/nvidia.c | 3 --- drivers/video/riva/fbdev.c | 2 -- 2 files changed, 5 deletions(-) diff -puN drivers/video/nvidia/nvidia.c~nv-drop-useless-module-ifdefs drivers/video/nvidia/nvidia.c --- a/drivers/video/nvidia/nvidia.c~nv-drop-useless-module-ifdefs +++ a/drivers/video/nvidia/nvidia.c @@ -1559,7 +1559,6 @@ static int __devinit nvidiafb_init(void) module_init(nvidiafb_init); -#ifdef MODULE static void __exit nvidiafb_exit(void) { pci_unregister_driver(&nvidiafb_driver); @@ -1615,5 +1614,3 @@ MODULE_PARM_DESC(nomtrr, "Disables MTRR MODULE_AUTHOR("Antonino Daplas"); MODULE_DESCRIPTION("Framebuffer driver for nVidia graphics chipset"); MODULE_LICENSE("GPL"); -#endif /* MODULE */ - diff -puN drivers/video/riva/fbdev.c~nv-drop-useless-module-ifdefs drivers/video/riva/fbdev.c --- a/drivers/video/riva/fbdev.c~nv-drop-useless-module-ifdefs +++ a/drivers/video/riva/fbdev.c @@ -2213,14 +2213,12 @@ static int __devinit rivafb_init(void) module_init(rivafb_init); -#ifdef MODULE static void __exit rivafb_exit(void) { pci_unregister_driver(&rivafb_driver); } module_exit(rivafb_exit); -#endif /* MODULE */ module_param(noaccel, bool, 0); MODULE_PARM_DESC(noaccel, "bool: disable acceleration"); _