diff options
Diffstat (limited to 'arch/arm/plat-omap/include/plat/multi.h')
| -rw-r--r-- | arch/arm/plat-omap/include/plat/multi.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/plat-omap/include/plat/multi.h b/arch/arm/plat-omap/include/plat/multi.h index ffd909fa5287..999ffba2690c 100644 --- a/arch/arm/plat-omap/include/plat/multi.h +++ b/arch/arm/plat-omap/include/plat/multi.h | |||
| @@ -66,7 +66,7 @@ | |||
| 66 | # error "OMAP1 and OMAP2PLUS can't be selected at the same time" | 66 | # error "OMAP1 and OMAP2PLUS can't be selected at the same time" |
| 67 | # endif | 67 | # endif |
| 68 | #endif | 68 | #endif |
| 69 | #ifdef CONFIG_ARCH_OMAP2420 | 69 | #ifdef CONFIG_SOC_OMAP2420 |
| 70 | # ifdef OMAP_NAME | 70 | # ifdef OMAP_NAME |
| 71 | # undef MULTI_OMAP2 | 71 | # undef MULTI_OMAP2 |
| 72 | # define MULTI_OMAP2 | 72 | # define MULTI_OMAP2 |
| @@ -74,7 +74,7 @@ | |||
| 74 | # define OMAP_NAME omap2420 | 74 | # define OMAP_NAME omap2420 |
| 75 | # endif | 75 | # endif |
| 76 | #endif | 76 | #endif |
| 77 | #ifdef CONFIG_ARCH_OMAP2430 | 77 | #ifdef CONFIG_SOC_OMAP2430 |
| 78 | # ifdef OMAP_NAME | 78 | # ifdef OMAP_NAME |
| 79 | # undef MULTI_OMAP2 | 79 | # undef MULTI_OMAP2 |
| 80 | # define MULTI_OMAP2 | 80 | # define MULTI_OMAP2 |