Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f40aac94 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

Merge branch 'omap_fixes_31' of git://git.pwsan.com/linux-2.6

parents 7063c88c 3c82e229

arch/arm/mach-omap2/board-2430sdp.c

+1 −1
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ static inline void board_smc91x_init(void) 


static void __init omap_2430sdp_init_irq(void)

{

	omap2_init_common_hw(NULL);

	omap2_init_common_hw(NULL, NULL);

	omap_init_irq();

	omap_gpio_init();

}

arch/arm/mach-omap2/board-3430sdp.c

+1 −1
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ static struct platform_device *sdp3430_devices[] __initdata = { 


static void __init omap_3430sdp_init_irq(void)

{

	omap2_init_common_hw(hyb18m512160af6_sdrc_params);

	omap2_init_common_hw(hyb18m512160af6_sdrc_params, NULL);

	omap_init_irq();

	omap_gpio_init();

}

arch/arm/mach-omap2/board-4430sdp.c

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ static void __init gic_init_irq(void) 


static void __init omap_4430sdp_init_irq(void)

{

	omap2_init_common_hw(NULL);

	omap2_init_common_hw(NULL, NULL);

#ifdef CONFIG_OMAP_32K_TIMER

	omap2_gp_clockevent_set_gptimer(1);

#endif

arch/arm/mach-omap2/board-apollon.c

+1 −1
Original line number Diff line number Diff line
@@ -250,7 +250,7 @@ static inline void __init apollon_init_smc91x(void) 


static void __init omap_apollon_init_irq(void)

{

	omap2_init_common_hw(NULL);

	omap2_init_common_hw(NULL, NULL);

	omap_init_irq();

	omap_gpio_init();

	apollon_init_smc91x();

arch/arm/mach-omap2/board-generic.c

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 


static void __init omap_generic_init_irq(void)

{

	omap2_init_common_hw(NULL);

	omap2_init_common_hw(NULL, NULL);

	omap_init_irq();

}