aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/Kconfig2
-rw-r--r--drivers/net/smc911x.c2
-rw-r--r--drivers/net/smc911x.h6
3 files changed, 8 insertions, 2 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 45f6cf531566..0e48b294200e 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -944,7 +944,7 @@ config SMC911X
944 tristate "SMSC LAN911[5678] support" 944 tristate "SMSC LAN911[5678] support"
945 select CRC32 945 select CRC32
946 select MII 946 select MII
947 depends on ARCH_PXA 947 depends on ARCH_PXA || SUPERH
948 help 948 help
949 This is a driver for SMSC's LAN911x series of Ethernet chipsets 949 This is a driver for SMSC's LAN911x series of Ethernet chipsets
950 including the new LAN9115, LAN9116, LAN9117, and LAN9118. 950 including the new LAN9115, LAN9116, LAN9117, and LAN9118.
diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c
index c0276c04dece..7c60df46fc65 100644
--- a/drivers/net/smc911x.c
+++ b/drivers/net/smc911x.c
@@ -2063,7 +2063,7 @@ static int __init smc911x_probe(struct net_device *dev, unsigned long ioaddr)
2063 2063
2064 /* Grab the IRQ */ 2064 /* Grab the IRQ */
2065 retval = request_irq(dev->irq, &smc911x_interrupt, 2065 retval = request_irq(dev->irq, &smc911x_interrupt,
2066 IRQF_SHARED | IRQF_TRIGGER_FALLING, dev->name, dev); 2066 IRQF_SHARED | SMC_IRQ_SENSE, dev->name, dev);
2067 if (retval) 2067 if (retval)
2068 goto err_out; 2068 goto err_out;
2069 2069
diff --git a/drivers/net/smc911x.h b/drivers/net/smc911x.h
index 962a710459fc..16a0edc078fd 100644
--- a/drivers/net/smc911x.h
+++ b/drivers/net/smc911x.h
@@ -36,6 +36,12 @@
36 #define SMC_USE_PXA_DMA 1 36 #define SMC_USE_PXA_DMA 1
37 #define SMC_USE_16BIT 0 37 #define SMC_USE_16BIT 0
38 #define SMC_USE_32BIT 1 38 #define SMC_USE_32BIT 1
39 #define SMC_IRQ_SENSE IRQF_TRIGGER_FALLING
40#elif CONFIG_SH_MAGIC_PANEL_R2
41 #define SMC_USE_SH_DMA 0
42 #define SMC_USE_16BIT 0
43 #define SMC_USE_32BIT 1
44 #define SMC_IRQ_SENSE IRQF_TRIGGER_LOW
39#endif 45#endif
40 46
41 47