diff options
Diffstat (limited to 'arch/arm/mach-omap2/board-omap3beagle.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-omap3beagle.c | 8 | 
1 files changed, 3 insertions, 5 deletions
diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c index 14f42240ae7..6c127605942 100644 --- a/arch/arm/mach-omap2/board-omap3beagle.c +++ b/arch/arm/mach-omap2/board-omap3beagle.c @@ -484,13 +484,13 @@ static struct platform_device keys_gpio = {  static void __init omap3_beagle_init_irq(void)  { -	omap2_init_common_hw(mt46h32m32lf6_sdrc_params, -			     mt46h32m32lf6_sdrc_params); +	omap2_init_common_infrastructure(); +	omap2_init_common_devices(mt46h32m32lf6_sdrc_params, +				  mt46h32m32lf6_sdrc_params);  	omap_init_irq();  #ifdef CONFIG_OMAP_32K_TIMER  	omap2_gp_clockevent_set_gptimer(12);  #endif -	omap_gpio_init();  }  static struct platform_device *omap3_beagle_devices[] __initdata = { @@ -548,8 +548,6 @@ static const struct ehci_hcd_omap_platform_data ehci_pdata __initconst = {  static struct omap_board_mux board_mux[] __initdata = {  	{ .reg_offset = OMAP_MUX_TERMINATOR },  }; -#else -#define board_mux	NULL  #endif  static struct omap_musb_board_data musb_board_data = {  |