diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-12-10 14:37:47 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-12-10 14:37:47 -0500 |
| commit | 79b357c2171ab3e52148503f0efa66d64a13413e (patch) | |
| tree | 7f134ef19ae4a882b32da87ce3d3ed9e5134691a /arch/arm/mach-omap2/board-omap3beagle.c | |
| parent | b2d6fef51223a1913c0d3230df4252ab49990bc1 (diff) | |
| parent | 5de62b86d2f5cf3459cb02ecb7a4530787bbd898 (diff) | |
Merge branch 'devel-gpio' into omap-for-linus
Diffstat (limited to 'arch/arm/mach-omap2/board-omap3beagle.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-omap3beagle.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c index d42c8c936053..f1a8edefa42f 100644 --- a/arch/arm/mach-omap2/board-omap3beagle.c +++ b/arch/arm/mach-omap2/board-omap3beagle.c | |||
| @@ -490,7 +490,6 @@ static void __init omap3_beagle_init_irq(void) | |||
| 490 | #ifdef CONFIG_OMAP_32K_TIMER | 490 | #ifdef CONFIG_OMAP_32K_TIMER |
| 491 | omap2_gp_clockevent_set_gptimer(12); | 491 | omap2_gp_clockevent_set_gptimer(12); |
| 492 | #endif | 492 | #endif |
| 493 | omap_gpio_init(); | ||
| 494 | } | 493 | } |
| 495 | 494 | ||
| 496 | static struct platform_device *omap3_beagle_devices[] __initdata = { | 495 | static struct platform_device *omap3_beagle_devices[] __initdata = { |