diff options
| author | Russell King | 2009-03-19 13:39:58 +0100 |
|---|---|---|
| committer | Russell King | 2009-03-19 13:39:58 +0100 |
| commit | 14b6848bc0134b8838d374c423df3edda9b1490e (patch) | |
| tree | 724dc912efe84f432d33a798502811c5f5295774 /arch/arm/mach-omap2/board-ldp.c | |
| parent | Merge branch 'for-russell' of git://git.kernel.org/pub/scm/linux/kernel/git/c... (diff) | |
| parent | [ARM] omap: clk_set_parent: deny changing parent if clock is enabled (diff) | |
| download | kernel-qcow2-linux-14b6848bc0134b8838d374c423df3edda9b1490e.tar.gz kernel-qcow2-linux-14b6848bc0134b8838d374c423df3edda9b1490e.tar.xz kernel-qcow2-linux-14b6848bc0134b8838d374c423df3edda9b1490e.zip | |
Merge branch 'omap-clks3' into devel
Conflicts:
arch/arm/mach-omap2/clock.c
Diffstat (limited to 'arch/arm/mach-omap2/board-ldp.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-ldp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-ldp.c b/arch/arm/mach-omap2/board-ldp.c index 6031e179926b..73e3fdb2d20a 100644 --- a/arch/arm/mach-omap2/board-ldp.c +++ b/arch/arm/mach-omap2/board-ldp.c @@ -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(); |