diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-10 23:10:10 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-10 23:10:10 +0100 |
| commit | 59aaade72544ad1be4183c1066c20b5883a78717 (patch) | |
| tree | da57c3029145c21b5eae457fbd66b997b503f155 /arch/arm/plat-omap/include/mach/io.h | |
| parent | 8e5bdc44ba82d1f75c8732c2c2b64a22bb622e8f (diff) | |
| parent | 99b3075b9095c23acf8d884bdc7fe33c8c3520f0 (diff) | |
Merge branch 'omap3-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 into omap-all
Diffstat (limited to 'arch/arm/plat-omap/include/mach/io.h')
| -rw-r--r-- | arch/arm/plat-omap/include/mach/io.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/plat-omap/include/mach/io.h b/arch/arm/plat-omap/include/mach/io.h index dd0cf069431..adc83b7b820 100644 --- a/arch/arm/plat-omap/include/mach/io.h +++ b/arch/arm/plat-omap/include/mach/io.h @@ -73,7 +73,6 @@ #define L4_24XX_VIRT 0xd8000000 #define L4_24XX_SIZE SZ_1M /* 1MB of 128MB used, want 1MB sect */ -#ifdef CONFIG_ARCH_OMAP2430 #define L4_WK_243X_PHYS L4_WK_243X_BASE /* 0x49000000 */ #define L4_WK_243X_VIRT 0xd9000000 #define L4_WK_243X_SIZE SZ_1M @@ -87,8 +86,6 @@ #define OMAP243X_SMS_VIRT 0xFC000000 #define OMAP243X_SMS_SIZE SZ_1M -#endif - #define IO_OFFSET 0x90000000 #define __IO_ADDRESS(pa) ((pa) + IO_OFFSET) /* Works for L3 and L4 */ #define __OMAP2_IO_ADDRESS(pa) ((pa) + IO_OFFSET) /* Works for L3 and L4 */ |