aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/cg6.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/video/cg6.c')
-rw-r--r--drivers/video/cg6.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/video/cg6.c b/drivers/video/cg6.c
index 49a2545671d9..9debe642fd2f 100644
--- a/drivers/video/cg6.c
+++ b/drivers/video/cg6.c
@@ -54,7 +54,9 @@ static struct fb_ops cg6_ops = {
54 .fb_sync = cg6_sync, 54 .fb_sync = cg6_sync,
55 .fb_mmap = cg6_mmap, 55 .fb_mmap = cg6_mmap,
56 .fb_ioctl = cg6_ioctl, 56 .fb_ioctl = cg6_ioctl,
57 .fb_cursor = soft_cursor, 57#ifdef CONFIG_COMPAT
58 .fb_compat_ioctl = sbusfb_compat_ioctl,
59#endif
58}; 60};
59 61
60/* Offset of interesting structures in the OBIO space */ 62/* Offset of interesting structures in the OBIO space */
@@ -654,12 +656,6 @@ static void cg6_chip_init(struct fb_info *info)
654 sbus_writel(0, &fbc->clipminy); 656 sbus_writel(0, &fbc->clipminy);
655 sbus_writel(info->var.xres - 1, &fbc->clipmaxx); 657 sbus_writel(info->var.xres - 1, &fbc->clipmaxx);
656 sbus_writel(info->var.yres - 1, &fbc->clipmaxy); 658 sbus_writel(info->var.yres - 1, &fbc->clipmaxy);
657
658 /* Disable cursor in Brooktree DAC. */
659 sbus_writel(0x06 << 24, &par->bt->addr);
660 tmp = sbus_readl(&par->bt->control);
661 tmp &= ~(0x03 << 24);
662 sbus_writel(tmp, &par->bt->control);
663} 659}
664 660
665struct all_info { 661struct all_info {