diff options
| author | Nathan Scott <nathans@bruce> | 2006-01-11 21:34:47 -0500 |
|---|---|---|
| committer | Nathan Scott <nathans@bruce> | 2006-01-11 21:34:47 -0500 |
| commit | ddae9c2ea79449beb00027cf77fca6dc489f2d15 (patch) | |
| tree | 047c2d7c8d6cbb0721f017514e1d83a20e278d43 /include/asm-parisc/io.h | |
| parent | 0d1335b3106687d87fcfa0e4d90f2a961bd7e1db (diff) | |
| parent | a4fc7ab1d065a9dd89ed0e74439ef87d4a16e980 (diff) | |
Merge HEAD from oss.sgi.com:/oss/git/linux-2.6.git
Diffstat (limited to 'include/asm-parisc/io.h')
| -rw-r--r-- | include/asm-parisc/io.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-parisc/io.h b/include/asm-parisc/io.h index b9bb5946ecc9..0db00adc942a 100644 --- a/include/asm-parisc/io.h +++ b/include/asm-parisc/io.h | |||
| @@ -41,7 +41,7 @@ extern void __raw_bad_addr(const volatile void __iomem *addr); | |||
| 41 | #define __raw_check_addr(addr) \ | 41 | #define __raw_check_addr(addr) \ |
| 42 | if (((unsigned long)addr >> NYBBLE_SHIFT) != 0xe) \ | 42 | if (((unsigned long)addr >> NYBBLE_SHIFT) != 0xe) \ |
| 43 | __raw_bad_addr(addr); \ | 43 | __raw_bad_addr(addr); \ |
| 44 | addr = (void *)((unsigned long)addr | (0xfUL << NYBBLE_SHIFT)); | 44 | addr = (void __iomem *)((unsigned long)addr | (0xfUL << NYBBLE_SHIFT)); |
| 45 | #else | 45 | #else |
| 46 | #define gsc_check_addr(addr) | 46 | #define gsc_check_addr(addr) |
| 47 | #define __raw_check_addr(addr) | 47 | #define __raw_check_addr(addr) |