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-rx51.c | |
parent | b2d6fef51223a1913c0d3230df4252ab49990bc1 (diff) | |
parent | 5de62b86d2f5cf3459cb02ecb7a4530787bbd898 (diff) |
Merge branch 'devel-gpio' into omap-for-linus
Diffstat (limited to 'arch/arm/mach-omap2/board-rx51.c')
-rw-r--r-- | arch/arm/mach-omap2/board-rx51.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-rx51.c b/arch/arm/mach-omap2/board-rx51.c index f3b6e103b01c..6635142d7d07 100644 --- a/arch/arm/mach-omap2/board-rx51.c +++ b/arch/arm/mach-omap2/board-rx51.c | |||
@@ -108,7 +108,6 @@ static void __init rx51_init_irq(void) | |||
108 | sdrc_params = rx51_get_sdram_timings(); | 108 | sdrc_params = rx51_get_sdram_timings(); |
109 | omap2_init_common_hw(sdrc_params, sdrc_params); | 109 | omap2_init_common_hw(sdrc_params, sdrc_params); |
110 | omap_init_irq(); | 110 | omap_init_irq(); |
111 | omap_gpio_init(); | ||
112 | } | 111 | } |
113 | 112 | ||
114 | extern void __init rx51_peripherals_init(void); | 113 | extern void __init rx51_peripherals_init(void); |