diff options
author | Tony Lindgren <tony@atomide.com> | 2010-12-10 11:37:47 -0800 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2010-12-10 11:37:47 -0800 |
commit | 79b357c2171ab3e52148503f0efa66d64a13413e (patch) | |
tree | 7f134ef19ae4a882b32da87ce3d3ed9e5134691a /arch/arm/mach-omap2/board-ldp.c | |
parent | b2d6fef51223a1913c0d3230df4252ab49990bc1 (diff) | |
parent | 5de62b86d2f5cf3459cb02ecb7a4530787bbd898 (diff) | |
download | linux-79b357c2171ab3e52148503f0efa66d64a13413e.tar.bz2 |
Merge branch 'devel-gpio' into omap-for-linus
Diffstat (limited to 'arch/arm/mach-omap2/board-ldp.c')
-rw-r--r-- | arch/arm/mach-omap2/board-ldp.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/board-ldp.c b/arch/arm/mach-omap2/board-ldp.c index 84b4ea67d156..7455b0aadf86 100644 --- a/arch/arm/mach-omap2/board-ldp.c +++ b/arch/arm/mach-omap2/board-ldp.c @@ -294,8 +294,6 @@ static void __init omap_ldp_init_irq(void) omap_board_config_size = ARRAY_SIZE(ldp_config); omap2_init_common_hw(NULL, NULL); omap_init_irq(); - omap_gpio_init(); - ldp_init_smsc911x(); } static struct twl4030_usb_data ldp_usb_data = { @@ -424,6 +422,7 @@ static struct mtd_partition ldp_nand_partitions[] = { static void __init omap_ldp_init(void) { omap3_mux_init(board_mux, OMAP_PACKAGE_CBB); + ldp_init_smsc911x(); omap_i2c_init(); platform_add_devices(ldp_devices, ARRAY_SIZE(ldp_devices)); ts_gpio = 54; |