Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

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

diff --git a/drivers/video/radeonfb.c b/drivers/video/radeonfb.c
index a78b9bd8f89752c856d05e06dc4e74c25faecdad..600318f708f294e2aafd4e2c04aa9767778735b8 100644 (file)
--- a/drivers/video/radeonfb.c
+++ b/drivers/video/radeonfb.c
@@ -2218,7 +2218,6 @@ static struct fb_ops radeonfb_ops = {
        .fb_copyarea    = cfb_copyarea,
        .fb_imageblit   = cfb_imageblit,
 #endif
-       .fb_cursor      = soft_cursor,
 };