From 0d4de142a75e720a9625e988df670729f29099ed Mon Sep 17 00:00:00 2001
From: Alexey Dobriyan <adobriyan@gmail.com>
Date: Mon, 28 Apr 2008 02:15:32 -0700
Subject: [PATCH] --- yaml --- r: 94189 b: refs/heads/master c:
 affc23d11631a47d35dfd552ded8ca255c001490 h: refs/heads/master i:   94187:
 517323188f929895c263162a31f9072e4491f541 v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/video/nvidia/nvidia.c | 3 ---
 trunk/drivers/video/riva/fbdev.c    | 2 --
 3 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index fe9adc779730..494be7bd8671 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3553a2fa8cbfc9f85f1809366be5884054f52c6d
+refs/heads/master: affc23d11631a47d35dfd552ded8ca255c001490
diff --git a/trunk/drivers/video/nvidia/nvidia.c b/trunk/drivers/video/nvidia/nvidia.c
index 596652d2831f..4f46e9cf8cca 100644
--- a/trunk/drivers/video/nvidia/nvidia.c
+++ b/trunk/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 support (0 or 1=disabled) "
 MODULE_AUTHOR("Antonino Daplas");
 MODULE_DESCRIPTION("Framebuffer driver for nVidia graphics chipset");
 MODULE_LICENSE("GPL");
-#endif				/* MODULE */
-
diff --git a/trunk/drivers/video/riva/fbdev.c b/trunk/drivers/video/riva/fbdev.c
index 5c47968e7f21..46a9237a11e4 100644
--- a/trunk/drivers/video/riva/fbdev.c
+++ b/trunk/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");