diff options
| -rw-r--r-- | drivers/net/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/net/smc911x.h | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index c537f53ffcb9..8c5e8405fe09 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
| @@ -955,7 +955,7 @@ config SMC911X | |||
| 955 | tristate "SMSC LAN911[5678] support" | 955 | tristate "SMSC LAN911[5678] support" |
| 956 | select CRC32 | 956 | select CRC32 |
| 957 | select MII | 957 | select MII |
| 958 | depends on ARCH_PXA || SH_MAGIC_PANEL_R2 | 958 | depends on ARCH_PXA || SUPERH |
| 959 | help | 959 | help |
| 960 | This is a driver for SMSC's LAN911x series of Ethernet chipsets | 960 | This is a driver for SMSC's LAN911x series of Ethernet chipsets |
| 961 | including the new LAN9115, LAN9116, LAN9117, and LAN9118. | 961 | including the new LAN9115, LAN9116, LAN9117, and LAN9118. |
diff --git a/drivers/net/smc911x.h b/drivers/net/smc911x.h index 266232271a72..7cc7cd7e99cd 100644 --- a/drivers/net/smc911x.h +++ b/drivers/net/smc911x.h | |||
| @@ -39,7 +39,6 @@ | |||
| 39 | #define SMC_USE_32BIT 1 | 39 | #define SMC_USE_32BIT 1 |
| 40 | #define SMC_IRQ_SENSE IRQF_TRIGGER_FALLING | 40 | #define SMC_IRQ_SENSE IRQF_TRIGGER_FALLING |
| 41 | #elif defined(CONFIG_SH_MAGIC_PANEL_R2) | 41 | #elif defined(CONFIG_SH_MAGIC_PANEL_R2) |
| 42 | #define SMC_USE_SH_DMA 0 | ||
| 43 | #define SMC_USE_16BIT 0 | 42 | #define SMC_USE_16BIT 0 |
| 44 | #define SMC_USE_32BIT 1 | 43 | #define SMC_USE_32BIT 1 |
| 45 | #define SMC_IRQ_SENSE IRQF_TRIGGER_LOW | 44 | #define SMC_IRQ_SENSE IRQF_TRIGGER_LOW |