diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-06-26 11:35:44 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-06-26 11:35:44 -0400 |
| commit | 62ed948cb1405fe95d61d8c6445c102e0c9da0a6 (patch) | |
| tree | f139adcc861a05e7cc09cdb387a271a652fc2d07 /include/asm-arm/arch-realview | |
| parent | 17ffc7ba6d7ea68b8d5f55a5ca1b87163e69720d (diff) | |
| parent | fcc18e83e1f6fd9fa6b333735bf0fcd530655511 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/asm-arm/arch-realview')
| -rw-r--r-- | include/asm-arm/arch-realview/io.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-arm/arch-realview/io.h b/include/asm-arm/arch-realview/io.h index d444a68ac330..c70f1dfbe135 100644 --- a/include/asm-arm/arch-realview/io.h +++ b/include/asm-arm/arch-realview/io.h | |||
| @@ -29,6 +29,5 @@ static inline void __iomem *__io(unsigned long addr) | |||
| 29 | 29 | ||
| 30 | #define __io(a) __io(a) | 30 | #define __io(a) __io(a) |
| 31 | #define __mem_pci(a) (a) | 31 | #define __mem_pci(a) (a) |
| 32 | #define __mem_isa(a) (a) | ||
| 33 | 32 | ||
| 34 | #endif | 33 | #endif |