diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-03 06:52:33 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-03 06:52:33 -0400 |
| commit | 56f68556d7bbb51dd158c74deb09c783345bfbbd (patch) | |
| tree | 536e6e3c7063b1eee927194dda257602bd3dc66f /arch/arm/mach-omap2/id.c | |
| parent | fd9470ce3ac6fb54d6026e4b1cdab0936e34805e (diff) | |
| parent | 7c8ad9828e793573877fd60868bb5d2f1e3b64da (diff) | |
Merge unstable branch 'omap-rmk'
Merge branch 'omap-rmk' into omap-all
Diffstat (limited to 'arch/arm/mach-omap2/id.c')
| -rw-r--r-- | arch/arm/mach-omap2/id.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c index a5d4526ac4d6..e53ebe7d58be 100644 --- a/arch/arm/mach-omap2/id.c +++ b/arch/arm/mach-omap2/id.c | |||
| @@ -21,11 +21,11 @@ | |||
| 21 | #include <mach/cpu.h> | 21 | #include <mach/cpu.h> |
| 22 | 22 | ||
| 23 | #if defined(CONFIG_ARCH_OMAP2420) | 23 | #if defined(CONFIG_ARCH_OMAP2420) |
| 24 | #define TAP_BASE io_p2v(0x48014000) | 24 | #define TAP_BASE IO_ADDRESS(0x48014000) |
| 25 | #elif defined(CONFIG_ARCH_OMAP2430) | 25 | #elif defined(CONFIG_ARCH_OMAP2430) |
| 26 | #define TAP_BASE io_p2v(0x4900A000) | 26 | #define TAP_BASE IO_ADDRESS(0x4900A000) |
| 27 | #elif defined(CONFIG_ARCH_OMAP34XX) | 27 | #elif defined(CONFIG_ARCH_OMAP34XX) |
| 28 | #define TAP_BASE io_p2v(0x4830A000) | 28 | #define TAP_BASE IO_ADDRESS(0x4830A000) |
| 29 | #endif | 29 | #endif |
| 30 | 30 | ||
| 31 | #define OMAP_TAP_IDCODE 0x0204 | 31 | #define OMAP_TAP_IDCODE 0x0204 |