diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 18:42:23 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 18:42:23 -0800 |
| commit | d27ba47e7e8c466c18983a1779d611f82d6a354f (patch) | |
| tree | 2870d82516be16e0cae63e1f7e84bd855bb34a23 /drivers/video | |
| parent | e3d8b77bc7a89d190ee895d0570af10c026e5086 (diff) | |
| parent | dd3e2dcf3408843ed35501c28626f389b30be756 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/cg6.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/video/cg6.c b/drivers/video/cg6.c index 3280bb9560e..414c4409e92 100644 --- a/drivers/video/cg6.c +++ b/drivers/video/cg6.c @@ -653,12 +653,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 { |