aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMagnus Damm <magnus.damm@gmail.com>2008-06-09 16:33:55 -0700
committerJeff Garzik <jgarzik@redhat.com>2008-06-11 21:58:13 -0400
commit1ae9d2f4d776bd7e5f64d957216051cd36eb6802 (patch)
treefbda074e6b1d88b42abd3ac6dfa2fbe5fd6dc17d
parent12c03f59c3909159010b87a926f5626d4380d441 (diff)
downloadkernel_samsung_smdk4412-1ae9d2f4d776bd7e5f64d957216051cd36eb6802.zip
kernel_samsung_smdk4412-1ae9d2f4d776bd7e5f64d957216051cd36eb6802.tar.gz
kernel_samsung_smdk4412-1ae9d2f4d776bd7e5f64d957216051cd36eb6802.tar.bz2
smc911x: SuperH architecture support
Enable the smc911x driver for the SuperH architecture. While at it remove the unused SMC_USE_SH_DMA definition. Signed-off-by: Magnus Damm <damm@igel.co.jp> Cc: Jeff Garzik <jeff@garzik.org> Cc: Paul Mundt <lethal@linux-sh.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
-rw-r--r--drivers/net/Kconfig2
-rw-r--r--drivers/net/smc911x.h1
2 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index c537f53..8c5e840 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -955,7 +955,7 @@ config SMC911X
tristate "SMSC LAN911[5678] support"
select CRC32
select MII
- depends on ARCH_PXA || SH_MAGIC_PANEL_R2
+ depends on ARCH_PXA || SUPERH
help
This is a driver for SMSC's LAN911x series of Ethernet chipsets
including the new LAN9115, LAN9116, LAN9117, and LAN9118.
diff --git a/drivers/net/smc911x.h b/drivers/net/smc911x.h
index 2662322..7cc7cd7 100644
--- a/drivers/net/smc911x.h
+++ b/drivers/net/smc911x.h
@@ -39,7 +39,6 @@
#define SMC_USE_32BIT 1
#define SMC_IRQ_SENSE IRQF_TRIGGER_FALLING
#elif defined(CONFIG_SH_MAGIC_PANEL_R2)
- #define SMC_USE_SH_DMA 0
#define SMC_USE_16BIT 0
#define SMC_USE_32BIT 1
#define SMC_IRQ_SENSE IRQF_TRIGGER_LOW