diff options
Diffstat (limited to 'arch/arm/mach-omap2/io.c')
-rw-r--r-- | arch/arm/mach-omap2/io.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c index c2032041d26..11decd85f18 100644 --- a/arch/arm/mach-omap2/io.c +++ b/arch/arm/mach-omap2/io.c | |||
@@ -66,7 +66,7 @@ static struct map_desc omap24xx_io_desc[] __initdata = { | |||
66 | }, | 66 | }, |
67 | }; | 67 | }; |
68 | 68 | ||
69 | #ifdef CONFIG_ARCH_OMAP2420 | 69 | #ifdef CONFIG_SOC_OMAP2420 |
70 | static struct map_desc omap242x_io_desc[] __initdata = { | 70 | static struct map_desc omap242x_io_desc[] __initdata = { |
71 | { | 71 | { |
72 | .virtual = DSP_MEM_2420_VIRT, | 72 | .virtual = DSP_MEM_2420_VIRT, |
@@ -90,7 +90,7 @@ static struct map_desc omap242x_io_desc[] __initdata = { | |||
90 | 90 | ||
91 | #endif | 91 | #endif |
92 | 92 | ||
93 | #ifdef CONFIG_ARCH_OMAP2430 | 93 | #ifdef CONFIG_SOC_OMAP2430 |
94 | static struct map_desc omap243x_io_desc[] __initdata = { | 94 | static struct map_desc omap243x_io_desc[] __initdata = { |
95 | { | 95 | { |
96 | .virtual = L4_WK_243X_VIRT, | 96 | .virtual = L4_WK_243X_VIRT, |
@@ -241,7 +241,7 @@ static void __init _omap2_map_common_io(void) | |||
241 | omap_sram_init(); | 241 | omap_sram_init(); |
242 | } | 242 | } |
243 | 243 | ||
244 | #ifdef CONFIG_ARCH_OMAP2420 | 244 | #ifdef CONFIG_SOC_OMAP2420 |
245 | void __init omap242x_map_common_io(void) | 245 | void __init omap242x_map_common_io(void) |
246 | { | 246 | { |
247 | iotable_init(omap24xx_io_desc, ARRAY_SIZE(omap24xx_io_desc)); | 247 | iotable_init(omap24xx_io_desc, ARRAY_SIZE(omap24xx_io_desc)); |
@@ -250,7 +250,7 @@ void __init omap242x_map_common_io(void) | |||
250 | } | 250 | } |
251 | #endif | 251 | #endif |
252 | 252 | ||
253 | #ifdef CONFIG_ARCH_OMAP2430 | 253 | #ifdef CONFIG_SOC_OMAP2430 |
254 | void __init omap243x_map_common_io(void) | 254 | void __init omap243x_map_common_io(void) |
255 | { | 255 | { |
256 | iotable_init(omap24xx_io_desc, ARRAY_SIZE(omap24xx_io_desc)); | 256 | iotable_init(omap24xx_io_desc, ARRAY_SIZE(omap24xx_io_desc)); |