Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6.23

[linux-2.6] / drivers / video / tx3912fb.c

diff --git a/drivers/video/tx3912fb.c b/drivers/video/tx3912fb.c
index 39d9ca71856b12aae581a72832287731e58c75b0..e6f7c78da68bf1a5e88677b8ccfa8b6c92f09170 100644 (file)
--- a/drivers/video/tx3912fb.c
+++ b/drivers/video/tx3912fb.c
@@ -14,7 +14,6 @@
 #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/string.h>
-#include <linux/tty.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
 #include <linux/init.h>
@@ -89,7 +88,6 @@ static struct fb_ops tx3912fb_ops = {
        .fb_fillrect    = cfb_fillrect,
        .fb_copyarea    = cfb_copyarea,
        .fb_imageblit   = cfb_imageblit,
-       .fb_cursor      = soft_cursor,
 };
 
 static int tx3912fb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
@@ -293,7 +291,7 @@ int __init tx3912fb_init(void)
        fb_info.fbops = &tx3912fb_ops;
        fb_info.var = tx3912fb_var;
        fb_info.fix = tx3912fb_fix;
-       fb_info.pseudo_palette = pseudo_palette;
+       fb_info.pseudo_palette = cfb8;
        fb_info.flags = FBINFO_DEFAULT;
 
        /* Clear the framebuffer */