summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-09-30 08:43:13 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-30 08:43:13 -0700
commitc4a7c77fcb8c0ef16e7193fb8cab2654282bbfab (patch)
treeca3a211950c7511609ba3f01ec11831d90882f22 /drivers
parenta36f4961952214bdfc396e035a047268ac48c5c3 (diff)
parent017fb98e70351e9fb5635c299c4d1c50e2f8b823 (diff)
downloadlinux-3.10-c4a7c77fcb8c0ef16e7193fb8cab2654282bbfab.tar.gz
linux-3.10-c4a7c77fcb8c0ef16e7193fb8cab2654282bbfab.tar.bz2
linux-3.10-c4a7c77fcb8c0ef16e7193fb8cab2654282bbfab.zip
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Diffstat (limited to 'drivers')
-rw-r--r--drivers/video/aty/radeon_base.c2
-rw-r--r--drivers/video/aty/radeonfb.h2
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/video/aty/radeon_base.c b/drivers/video/aty/radeon_base.c
index 046b4786026..8a24a66d9ba 100644
--- a/drivers/video/aty/radeon_base.c
+++ b/drivers/video/aty/radeon_base.c
@@ -475,7 +475,7 @@ static int __devinit radeon_probe_pll_params(struct radeonfb_info *rinfo)
*/
/* Flush PCI buffers ? */
- tmp = INREG(DEVICE_ID);
+ tmp = INREG16(DEVICE_ID);
local_irq_disable();
diff --git a/drivers/video/aty/radeonfb.h b/drivers/video/aty/radeonfb.h
index 659bc9f6224..01b8b2f7851 100644
--- a/drivers/video/aty/radeonfb.h
+++ b/drivers/video/aty/radeonfb.h
@@ -395,6 +395,8 @@ static inline void _radeon_msleep(struct radeonfb_info *rinfo, unsigned long ms)
#define INREG8(addr) readb((rinfo->mmio_base)+addr)
#define OUTREG8(addr,val) writeb(val, (rinfo->mmio_base)+addr)
+#define INREG16(addr) readw((rinfo->mmio_base)+addr)
+#define OUTREG16(addr,val) writew(val, (rinfo->mmio_base)+addr)
#define INREG(addr) readl((rinfo->mmio_base)+addr)
#define OUTREG(addr,val) writel(val, (rinfo->mmio_base)+addr)