diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-11 00:31:24 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-11 00:31:24 -0500 |
| commit | 05f6ece6f37f987e9de643f6f76e8fb5d5b9e014 (patch) | |
| tree | 5244e85d0dfb2619b0af4bc80a2c99dd579f79a5 /include/asm-parisc/io.h | |
| parent | 35d138ae22f826f95f0f8d0285947582ccf4508f (diff) | |
| parent | 58b6c58caef7a34eab7ec887288fa495696653e7 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6
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) |