diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-08-02 13:23:38 +0200 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-08-02 13:23:38 +0200 |
| commit | 055a1b8c9927bc587f293020a54c6cd8e24dfac0 (patch) | |
| tree | db7c8d00931180c4896c9e00d2cb506939592cda /arch/arm/mach-omap2/board-2430sdp.c | |
| parent | omap: mux: fix multipath gpio handling (diff) | |
| parent | omap: Devkit8000: Use DIE id to initialize dm9000 MAC address (diff) | |
| download | linux-055a1b8c9927bc587f293020a54c6cd8e24dfac0.tar.xz linux-055a1b8c9927bc587f293020a54c6cd8e24dfac0.zip | |
Merge branch 'devel-misc' into omap-for-linus
Diffstat (limited to 'arch/arm/mach-omap2/board-2430sdp.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-2430sdp.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/arm/mach-omap2/board-2430sdp.c b/arch/arm/mach-omap2/board-2430sdp.c index 71bf5097e102..ba188cf7d09d 100644 --- a/arch/arm/mach-omap2/board-2430sdp.c +++ b/arch/arm/mach-omap2/board-2430sdp.c @@ -122,11 +122,7 @@ static struct omap_smc91x_platform_data board_smc91x_data = { static void __init board_smc91x_init(void) { - if (omap_rev() > OMAP3430_REV_ES1_0) - board_smc91x_data.gpio_irq = 6; - else - board_smc91x_data.gpio_irq = 29; - + omap_mux_init_gpio(149, OMAP_PIN_INPUT); gpmc_smc91x_init(&board_smc91x_data); } |