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-omap1/board-ams-delta.c | |
| parent | b2d6fef51223a1913c0d3230df4252ab49990bc1 (diff) | |
| parent | 5de62b86d2f5cf3459cb02ecb7a4530787bbd898 (diff) | |
Merge branch 'devel-gpio' into omap-for-linus
Diffstat (limited to 'arch/arm/mach-omap1/board-ams-delta.c')
| -rw-r--r-- | arch/arm/mach-omap1/board-ams-delta.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-omap1/board-ams-delta.c b/arch/arm/mach-omap1/board-ams-delta.c index dc82f3d028b5..e1439506eba9 100644 --- a/arch/arm/mach-omap1/board-ams-delta.c +++ b/arch/arm/mach-omap1/board-ams-delta.c | |||
| @@ -141,7 +141,6 @@ static void __init ams_delta_init_irq(void) | |||
| 141 | { | 141 | { |
| 142 | omap1_init_common_hw(); | 142 | omap1_init_common_hw(); |
| 143 | omap_init_irq(); | 143 | omap_init_irq(); |
| 144 | omap_gpio_init(); | ||
| 145 | } | 144 | } |
| 146 | 145 | ||
| 147 | static struct map_desc ams_delta_io_desc[] __initdata = { | 146 | static struct map_desc ams_delta_io_desc[] __initdata = { |