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-overo.c | |
| parent | b2d6fef51223a1913c0d3230df4252ab49990bc1 (diff) | |
| parent | 5de62b86d2f5cf3459cb02ecb7a4530787bbd898 (diff) | |
Merge branch 'devel-gpio' into omap-for-linus
Diffstat (limited to 'arch/arm/mach-omap2/board-overo.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-overo.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-overo.c b/arch/arm/mach-omap2/board-overo.c index 133b5ead830d..b75bdcd47117 100644 --- a/arch/arm/mach-omap2/board-overo.c +++ b/arch/arm/mach-omap2/board-overo.c | |||
| @@ -416,7 +416,6 @@ static void __init overo_init_irq(void) | |||
| 416 | omap2_init_common_hw(mt46h32m32lf6_sdrc_params, | 416 | omap2_init_common_hw(mt46h32m32lf6_sdrc_params, |
| 417 | mt46h32m32lf6_sdrc_params); | 417 | mt46h32m32lf6_sdrc_params); |
| 418 | omap_init_irq(); | 418 | omap_init_irq(); |
| 419 | omap_gpio_init(); | ||
| 420 | } | 419 | } |
| 421 | 420 | ||
| 422 | static struct platform_device *overo_devices[] __initdata = { | 421 | static struct platform_device *overo_devices[] __initdata = { |