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 9d9d2009ad8caa3af457d263afa5c8717227016a..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.
@@ -63,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,
 };