diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-30 11:43:13 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-30 11:43:13 -0400 |
| commit | c4a7c77fcb8c0ef16e7193fb8cab2654282bbfab (patch) | |
| tree | ca3a211950c7511609ba3f01ec11831d90882f22 /drivers/video/aty/radeon_base.c | |
| parent | a36f4961952214bdfc396e035a047268ac48c5c3 (diff) | |
| parent | 017fb98e70351e9fb5635c299c4d1c50e2f8b823 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Diffstat (limited to 'drivers/video/aty/radeon_base.c')
| -rw-r--r-- | drivers/video/aty/radeon_base.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/aty/radeon_base.c b/drivers/video/aty/radeon_base.c index 046b47860266..8a24a66d9ba8 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) | |||
| 475 | */ | 475 | */ |
| 476 | 476 | ||
| 477 | /* Flush PCI buffers ? */ | 477 | /* Flush PCI buffers ? */ |
| 478 | tmp = INREG(DEVICE_ID); | 478 | tmp = INREG16(DEVICE_ID); |
| 479 | 479 | ||
| 480 | local_irq_disable(); | 480 | local_irq_disable(); |
| 481 | 481 | ||