diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-03-19 08:39:58 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-03-19 08:39:58 -0400 |
| commit | 14b6848bc0134b8838d374c423df3edda9b1490e (patch) | |
| tree | 724dc912efe84f432d33a798502811c5f5295774 /arch/arm/mach-omap2/board-omap3beagle.c | |
| parent | 05d9881bc4c6f172997b7a59e4a1a95910c4ebd7 (diff) | |
| parent | 4da3782151300237db3abe070f716922889252e0 (diff) | |
Merge branch 'omap-clks3' into devel
Conflicts:
arch/arm/mach-omap2/clock.c
Diffstat (limited to 'arch/arm/mach-omap2/board-omap3beagle.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-omap3beagle.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c index 38c88fbe658d..ad312ccf2ec5 100644 --- a/arch/arm/mach-omap2/board-omap3beagle.c +++ b/arch/arm/mach-omap2/board-omap3beagle.c | |||
| @@ -184,7 +184,7 @@ static int __init omap3_beagle_i2c_init(void) | |||
| 184 | 184 | ||
| 185 | static void __init omap3_beagle_init_irq(void) | 185 | static void __init omap3_beagle_init_irq(void) |
| 186 | { | 186 | { |
| 187 | omap2_init_common_hw(); | 187 | omap2_init_common_hw(NULL); |
| 188 | omap_init_irq(); | 188 | omap_init_irq(); |
| 189 | omap_gpio_init(); | 189 | omap_gpio_init(); |
| 190 | } | 190 | } |