diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-08-02 07:23:38 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-08-02 07:23:38 -0400 |
| commit | 055a1b8c9927bc587f293020a54c6cd8e24dfac0 (patch) | |
| tree | db7c8d00931180c4896c9e00d2cb506939592cda /arch/arm/mach-omap2/board-2430sdp.c | |
| parent | 8a6f7e14fc3b3ea911838c3f4ce137cb8a3d134a (diff) | |
| parent | f535daed925c2d3c1db06b06a63c4955f2c51988 (diff) | |
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 = { | |||
| 122 | 122 | ||
| 123 | static void __init board_smc91x_init(void) | 123 | static void __init board_smc91x_init(void) |
| 124 | { | 124 | { |
| 125 | if (omap_rev() > OMAP3430_REV_ES1_0) | 125 | omap_mux_init_gpio(149, OMAP_PIN_INPUT); |
| 126 | board_smc91x_data.gpio_irq = 6; | ||
| 127 | else | ||
| 128 | board_smc91x_data.gpio_irq = 29; | ||
| 129 | |||
| 130 | gpmc_smc91x_init(&board_smc91x_data); | 126 | gpmc_smc91x_init(&board_smc91x_data); |
| 131 | } | 127 | } |
| 132 | 128 | ||