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-omap3pandora.c | |
| parent | b2d6fef51223a1913c0d3230df4252ab49990bc1 (diff) | |
| parent | 5de62b86d2f5cf3459cb02ecb7a4530787bbd898 (diff) | |
Merge branch 'devel-gpio' into omap-for-linus
Diffstat (limited to 'arch/arm/mach-omap2/board-omap3pandora.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-omap3pandora.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-omap3pandora.c b/arch/arm/mach-omap2/board-omap3pandora.c index 445b15843212..de8df58b8f1d 100644 --- a/arch/arm/mach-omap2/board-omap3pandora.c +++ b/arch/arm/mach-omap2/board-omap3pandora.c | |||
| @@ -639,7 +639,6 @@ static void __init omap3pandora_init_irq(void) | |||
| 639 | omap2_init_common_hw(mt46h32m32lf6_sdrc_params, | 639 | omap2_init_common_hw(mt46h32m32lf6_sdrc_params, |
| 640 | mt46h32m32lf6_sdrc_params); | 640 | mt46h32m32lf6_sdrc_params); |
| 641 | omap_init_irq(); | 641 | omap_init_irq(); |
| 642 | omap_gpio_init(); | ||
| 643 | } | 642 | } |
| 644 | 643 | ||
| 645 | static void pandora_wl1251_set_power(bool enable) | 644 | static void pandora_wl1251_set_power(bool enable) |