Merge branch 'nommu' of master.kernel.org:/home/rmk/linux-2.6-arm

[~andy/linux] / drivers / video / tgafb.c

diff --git a/drivers/video/tgafb.c b/drivers/video/tgafb.c
index 3099630d0c3d0b0e4cd17513085c1c1500784dc3..6c2c78ab9827c71236cbe1ea0db522b0b15b3b6d 100644 (file)
--- a/drivers/video/tgafb.c
+++ b/drivers/video/tgafb.c
@@ -26,7 +26,6 @@
 #include <linux/selection.h>
 #include <asm/io.h>
 #include <video/tgafb.h>
-#include <linux/selection.h>
 
 /*
  * Local functions.
@@ -45,9 +44,7 @@ static void tgafb_fillrect(struct fb_info *, const struct fb_fillrect *);
 static void tgafb_copyarea(struct fb_info *, const struct fb_copyarea *);
 
 static int tgafb_pci_register(struct pci_dev *, const struct pci_device_id *);
-#ifdef MODULE
 static void tgafb_pci_unregister(struct pci_dev *);
-#endif
 
 static const char *mode_option = "640x480@60";
 
@@ -65,7 +62,6 @@ static struct fb_ops tgafb_ops = {
        .fb_fillrect            = tgafb_fillrect,
        .fb_copyarea            = tgafb_copyarea,
        .fb_imageblit           = tgafb_imageblit,
-       .fb_cursor              = soft_cursor,
 };
 
 
@@ -1484,7 +1480,6 @@ tgafb_pci_register(struct pci_dev *pdev, const struct pci_device_id *ent)
        return ret;
 }
 
-#ifdef MODULE
 static void __exit
 tgafb_pci_unregister(struct pci_dev *pdev)
 {
@@ -1500,6 +1495,7 @@ tgafb_pci_unregister(struct pci_dev *pdev)
        kfree(info);
 }
 
+#ifdef MODULE
 static void __exit
 tgafb_exit(void)
 {