diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-17 08:45:42 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-17 08:45:42 -0800 |
commit | d0fa7e9f8ebeb19db4d2aed33c35f9d16fa7f32d (patch) | |
tree | 092bf1f6cd50db2272d12ad6991ac3465f2d19ef /include/asm-arm/arch-realview/hardware.h | |
parent | Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev (diff) | |
parent | [ARM] No need to include asm/proc-fns.h into asm/system.h (diff) | |
download | linux-dev-d0fa7e9f8ebeb19db4d2aed33c35f9d16fa7f32d.tar.xz linux-dev-d0fa7e9f8ebeb19db4d2aed33c35f9d16fa7f32d.zip |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'include/asm-arm/arch-realview/hardware.h')
-rw-r--r-- | include/asm-arm/arch-realview/hardware.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-arm/arch-realview/hardware.h b/include/asm-arm/arch-realview/hardware.h index 67879cdb6ef2..9ca76dc3a7af 100644 --- a/include/asm-arm/arch-realview/hardware.h +++ b/include/asm-arm/arch-realview/hardware.h @@ -27,5 +27,6 @@ /* macro to get at IO space when running virtually */ #define IO_ADDRESS(x) (((x) & 0x0fffffff) + (((x) >> 4) & 0x0f000000) + 0xf0000000) +#define __io_address(n) __io(IO_ADDRESS(n)) #endif |