diff options
| -rw-r--r-- | arch/arm/mach-omap2/board-generic.c | 12 | 
1 files changed, 4 insertions, 8 deletions
diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c index d5875606048..9d25cb6c9a0 100644 --- a/arch/arm/mach-omap2/board-generic.c +++ b/arch/arm/mach-omap2/board-generic.c @@ -90,14 +90,13 @@ static void __init omap3_init(void)  }  #endif -#if defined(CONFIG_SOC_OMAP2420) +#ifdef CONFIG_SOC_OMAP2420  static const char *omap242x_boards_compat[] __initdata = {  	"ti,omap2420",  	NULL,  };  DT_MACHINE_START(OMAP242X_DT, "Generic OMAP2420 (Flattened Device Tree)") -	.atag_offset	= 0x100,  	.reserve	= omap_reserve,  	.map_io		= omap242x_map_io,  	.init_early	= omap2420_init_early, @@ -109,14 +108,13 @@ DT_MACHINE_START(OMAP242X_DT, "Generic OMAP2420 (Flattened Device Tree)")  MACHINE_END  #endif -#if defined(CONFIG_SOC_OMAP2430) +#ifdef CONFIG_SOC_OMAP2430  static const char *omap243x_boards_compat[] __initdata = {  	"ti,omap2430",  	NULL,  };  DT_MACHINE_START(OMAP243X_DT, "Generic OMAP2430 (Flattened Device Tree)") -	.atag_offset	= 0x100,  	.reserve	= omap_reserve,  	.map_io		= omap243x_map_io,  	.init_early	= omap2430_init_early, @@ -129,14 +127,13 @@ DT_MACHINE_START(OMAP243X_DT, "Generic OMAP2430 (Flattened Device Tree)")  MACHINE_END  #endif -#if defined(CONFIG_ARCH_OMAP3) +#ifdef CONFIG_ARCH_OMAP3  static const char *omap3_boards_compat[] __initdata = {  	"ti,omap3",  	NULL,  };  DT_MACHINE_START(OMAP3_DT, "Generic OMAP3 (Flattened Device Tree)") -	.atag_offset	= 0x100,  	.reserve	= omap_reserve,  	.map_io		= omap3_map_io,  	.init_early	= omap3430_init_early, @@ -148,14 +145,13 @@ DT_MACHINE_START(OMAP3_DT, "Generic OMAP3 (Flattened Device Tree)")  MACHINE_END  #endif -#if defined(CONFIG_ARCH_OMAP4) +#ifdef CONFIG_ARCH_OMAP4  static const char *omap4_boards_compat[] __initdata = {  	"ti,omap4",  	NULL,  };  DT_MACHINE_START(OMAP4_DT, "Generic OMAP4 (Flattened Device Tree)") -	.atag_offset	= 0x100,  	.reserve	= omap_reserve,  	.map_io		= omap4_map_io,  	.init_early	= omap4430_init_early,  |