summaryrefslogtreecommitdiff
path: root/arch/arm/mach-omap2/board-h4.c
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2010-12-10 22:37:47 +0300
committerTony Lindgren <tony@atomide.com>2010-12-10 22:37:47 +0300
commit79b357c2171ab3e52148503f0efa66d64a13413e (patch)
tree7f134ef19ae4a882b32da87ce3d3ed9e5134691a /arch/arm/mach-omap2/board-h4.c
parentb2d6fef51223a1913c0d3230df4252ab49990bc1 (diff)
parent5de62b86d2f5cf3459cb02ecb7a4530787bbd898 (diff)
downloadlinux-79b357c2171ab3e52148503f0efa66d64a13413e.tar.xz
Merge branch 'devel-gpio' into omap-for-linus
Diffstat (limited to 'arch/arm/mach-omap2/board-h4.c')
-rw-r--r--arch/arm/mach-omap2/board-h4.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-h4.c b/arch/arm/mach-omap2/board-h4.c
index 263da1da181c..9ec77a4a6b88 100644
--- a/arch/arm/mach-omap2/board-h4.c
+++ b/arch/arm/mach-omap2/board-h4.c
@@ -293,7 +293,6 @@ static void __init omap_h4_init_irq(void)
omap_board_config_size = ARRAY_SIZE(h4_config);
omap2_init_common_hw(NULL, NULL);
omap_init_irq();
- omap_gpio_init();
h4_init_flash();
}