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-omap3logic.c | |
| parent | b2d6fef51223a1913c0d3230df4252ab49990bc1 (diff) | |
| parent | 5de62b86d2f5cf3459cb02ecb7a4530787bbd898 (diff) | |
Merge branch 'devel-gpio' into omap-for-linus
Diffstat (limited to 'arch/arm/mach-omap2/board-omap3logic.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-omap3logic.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-omap3logic.c b/arch/arm/mach-omap2/board-omap3logic.c index e2e9562f4de9..cfd618d3bda8 100644 --- a/arch/arm/mach-omap2/board-omap3logic.c +++ b/arch/arm/mach-omap2/board-omap3logic.c | |||
| @@ -199,7 +199,6 @@ static void __init omap3logic_init_irq(void) | |||
| 199 | { | 199 | { |
| 200 | omap2_init_common_hw(NULL, NULL); | 200 | omap2_init_common_hw(NULL, NULL); |
| 201 | omap_init_irq(); | 201 | omap_init_irq(); |
| 202 | omap_gpio_init(); | ||
| 203 | } | 202 | } |
| 204 | 203 | ||
| 205 | #ifdef CONFIG_OMAP_MUX | 204 | #ifdef CONFIG_OMAP_MUX |