Merge branch 'omap-clks3' into devel
Conflicts: arch/arm/mach-omap2/clock.c
This commit is contained in:
@@ -98,7 +98,7 @@ static inline void __init ldp_init_smc911x(void)
|
||||
|
||||
static void __init omap_ldp_init_irq(void)
|
||||
{
|
||||
omap2_init_common_hw();
|
||||
omap2_init_common_hw(NULL);
|
||||
omap_init_irq();
|
||||
omap_gpio_init();
|
||||
ldp_init_smc911x();
|
||||
|
Reference in New Issue
Block a user