diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-03-27 23:54:12 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-03-27 23:54:12 +0000 |
| commit | d3e71cb08747743fce908122bab08b479eb403a5 (patch) | |
| tree | cbec6948fdbdee9af81cf3ecfb504070d2745d7b /drivers/video/cgthreefb.c | |
| parent | fe7ff1706e323d0e5ed83972960a1ecc1ee538b3 (diff) | |
Merge with Linux 2.3.99-pre3.
Diffstat (limited to 'drivers/video/cgthreefb.c')
| -rw-r--r-- | drivers/video/cgthreefb.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/video/cgthreefb.c b/drivers/video/cgthreefb.c index 5e4d45a9e..9cec20abf 100644 --- a/drivers/video/cgthreefb.c +++ b/drivers/video/cgthreefb.c @@ -1,4 +1,4 @@ -/* $Id: cgthreefb.c,v 1.8 1999/11/19 09:57:08 davem Exp $ +/* $Id: cgthreefb.c,v 1.9 2000/03/19 04:20:44 anton Exp $ * cgthreefb.c: CGthree frame buffer driver * * Copyright (C) 1996,1998 Jakub Jelinek (jj@ultra.linux.cz) @@ -114,9 +114,9 @@ static void cg3_blank (struct fb_info_sbusfb *fb) u8 tmp; spin_lock_irqsave(&fb->lock, flags); - tmp = sbus_readl(&fb->s.cg3.regs->control); + tmp = sbus_readb(&fb->s.cg3.regs->control); tmp &= ~CG3_CR_ENABLE_VIDEO; - sbus_writel(tmp, &fb->s.cg3.regs->control); + sbus_writeb(tmp, &fb->s.cg3.regs->control); spin_unlock_irqrestore(&fb->lock, flags); } @@ -126,9 +126,9 @@ static void cg3_unblank (struct fb_info_sbusfb *fb) u8 tmp; spin_lock_irqsave(&fb->lock, flags); - tmp = sbus_readl(&fb->s.cg3.regs->control); + tmp = sbus_readb(&fb->s.cg3.regs->control); tmp |= CG3_CR_ENABLE_VIDEO; - sbus_writel(tmp, &fb->s.cg3.regs->control); + sbus_writeb(tmp, &fb->s.cg3.regs->control); spin_unlock_irqrestore(&fb->lock, flags); } |