diff options
author | Tony Lindgren <tony@atomide.com> | 2010-12-10 11:37:47 -0800 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2010-12-10 11:37:47 -0800 |
commit | 79b357c2171ab3e52148503f0efa66d64a13413e (patch) | |
tree | 7f134ef19ae4a882b32da87ce3d3ed9e5134691a /arch/arm/mach-omap2/board-3430sdp.c | |
parent | b2d6fef51223a1913c0d3230df4252ab49990bc1 (diff) | |
parent | 5de62b86d2f5cf3459cb02ecb7a4530787bbd898 (diff) | |
download | op-kernel-dev-79b357c2171ab3e52148503f0efa66d64a13413e.zip op-kernel-dev-79b357c2171ab3e52148503f0efa66d64a13413e.tar.gz |
Merge branch 'devel-gpio' into omap-for-linus
Diffstat (limited to 'arch/arm/mach-omap2/board-3430sdp.c')
-rw-r--r-- | arch/arm/mach-omap2/board-3430sdp.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-3430sdp.c b/arch/arm/mach-omap2/board-3430sdp.c index ad4cb26..869fb13 100644 --- a/arch/arm/mach-omap2/board-3430sdp.c +++ b/arch/arm/mach-omap2/board-3430sdp.c @@ -328,7 +328,6 @@ static void __init omap_3430sdp_init_irq(void) omap3_pm_init_cpuidle(omap3_cpuidle_params_table); omap2_init_common_hw(hyb18m512160af6_sdrc_params, NULL); omap_init_irq(); - omap_gpio_init(); } static int sdp3430_batt_table[] = { |