]> err.no Git - linux-2.6/commitdiff
smc911x: SuperH architecture support
authorMagnus Damm <magnus.damm@gmail.com>
Mon, 9 Jun 2008 23:33:55 +0000 (16:33 -0700)
committerJeff Garzik <jgarzik@redhat.com>
Thu, 12 Jun 2008 01:58:13 +0000 (21:58 -0400)
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>
drivers/net/Kconfig
drivers/net/smc911x.h

index c537f53ffcb9c6714594213ba1de96565d9a5dcf..8c5e8405fe0901cb54bf7f3ebb7dc0cf0ddb98bc 100644 (file)
@@ -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.
index 266232271a72879467afab4579f9dcad68ad3071..7cc7cd7e99cde913fb29ab39f7f1c817cccd74a8 100644 (file)
@@ -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