Merge branches 'boards' and 'fixes' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-omap-h63xx.git] / arch / avr32 / mach-at32ap / at32ap700x.c

diff --git a/arch/avr32/mach-at32ap/at32ap700x.c b/arch/avr32/mach-at32ap/at32ap700x.c
index 748ac68c73dcb0bf0e1367dbf5f3c0afddd8e02f..0c6e02f80a31ce6cd562aa2147d0144a3e89b913 100644 (file)
--- a/arch/avr32/mach-at32ap/at32ap700x.c
+++ b/arch/avr32/mach-at32ap/at32ap700x.c
@@ -1094,7 +1094,9 @@ at32_add_device_eth(unsigned int id, struct eth_platform_data *data)
                        pin_mask |= (1 << 11);  /* RXD2 */
                        pin_mask |= (1 << 12);  /* RXD3 */
                        pin_mask |= (1 << 14);  /* RXCK */
+#ifndef CONFIG_BOARD_MIMC200
                        pin_mask |= (1 << 18);  /* SPD  */
+#endif
                }
 
                select_peripheral(PIOC, pin_mask, PERIPH_A, 0);
@@ -1115,8 +1117,10 @@ at32_add_device_eth(unsigned int id, struct eth_platform_data *data)
                pin_mask |= (1 << 3);   /* MDC  */
                pin_mask |= (1 << 2);   /* MDIO */
 
+#ifndef CONFIG_BOARD_MIMC200
                if (!data->is_rmii)
                        pin_mask |= (1 << 15);  /* SPD  */
+#endif
 
                select_peripheral(PIOD, pin_mask, PERIPH_B, 0);