Merge branch 'halasa-hdlc' of git://git.tuxdriver.com/git/netdev-jwl

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

diff --git a/drivers/video/cg6.c b/drivers/video/cg6.c
index 3280bb9560e26b2f1ddf9b79511ac1aac7643b84..9debe642fd2f8825a0b394112d30ee8bc12c46c1 100644 (file)
--- a/drivers/video/cg6.c
+++ b/drivers/video/cg6.c
@@ -54,6 +54,9 @@ static struct fb_ops cg6_ops = {
        .fb_sync                = cg6_sync,
        .fb_mmap                = cg6_mmap,
        .fb_ioctl               = cg6_ioctl,
+#ifdef CONFIG_COMPAT
+       .fb_compat_ioctl        = sbusfb_compat_ioctl,
+#endif
 };
 
 /* Offset of interesting structures in the OBIO space */
@@ -653,12 +656,6 @@ static void cg6_chip_init(struct fb_info *info)
        sbus_writel(0, &fbc->clipminy);
        sbus_writel(info->var.xres - 1, &fbc->clipmaxx);
        sbus_writel(info->var.yres - 1, &fbc->clipmaxy);
-
-       /* Disable cursor in Brooktree DAC. */
-       sbus_writel(0x06 << 24, &par->bt->addr);
-       tmp = sbus_readl(&par->bt->control);
-       tmp &= ~(0x03 << 24);
-       sbus_writel(tmp, &par->bt->control);
 }
 
 struct all_info {