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-zoom.c | |
| parent | b2d6fef51223a1913c0d3230df4252ab49990bc1 (diff) | |
| parent | 5de62b86d2f5cf3459cb02ecb7a4530787bbd898 (diff) | |
Merge branch 'devel-gpio' into omap-for-linus
Diffstat (limited to 'arch/arm/mach-omap2/board-zoom.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-zoom.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-zoom.c b/arch/arm/mach-omap2/board-zoom.c index 27979fd527d3..0dff9deaa896 100644 --- a/arch/arm/mach-omap2/board-zoom.c +++ b/arch/arm/mach-omap2/board-zoom.c | |||
| @@ -43,7 +43,6 @@ static void __init omap_zoom_init_irq(void) | |||
| 43 | h8mbx00u0mer0em_sdrc_params); | 43 | h8mbx00u0mer0em_sdrc_params); |
| 44 | 44 | ||
| 45 | omap_init_irq(); | 45 | omap_init_irq(); |
| 46 | omap_gpio_init(); | ||
| 47 | } | 46 | } |
| 48 | 47 | ||
| 49 | #ifdef CONFIG_OMAP_MUX | 48 | #ifdef CONFIG_OMAP_MUX |