diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-12-10 20:37:47 +0100 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-12-10 20:37:47 +0100 |
| commit | 79b357c2171ab3e52148503f0efa66d64a13413e (patch) | |
| tree | 7f134ef19ae4a882b32da87ce3d3ed9e5134691a /arch/arm/mach-omap2/board-omap3touchbook.c | |
| parent | omap1: Delete old defconfigs (diff) | |
| parent | omap1: Fix gpio mpuio bank to work for multi-omap for 7xx/15xx/16xx (diff) | |
| download | linux-79b357c2171ab3e52148503f0efa66d64a13413e.tar.xz linux-79b357c2171ab3e52148503f0efa66d64a13413e.zip | |
Merge branch 'devel-gpio' into omap-for-linus
Diffstat (limited to 'arch/arm/mach-omap2/board-omap3touchbook.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-omap3touchbook.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-omap3touchbook.c b/arch/arm/mach-omap2/board-omap3touchbook.c index 8d530a607f85..baa72c507d4c 100644 --- a/arch/arm/mach-omap2/board-omap3touchbook.c +++ b/arch/arm/mach-omap2/board-omap3touchbook.c @@ -426,7 +426,6 @@ static void __init omap3_touchbook_init_irq(void) #ifdef CONFIG_OMAP_32K_TIMER omap2_gp_clockevent_set_gptimer(12); #endif - omap_gpio_init(); } static struct platform_device *omap3_touchbook_devices[] __initdata = { |