diff --git a/[refs] b/[refs]
index 5e2a9b5b1ca9..4aa3b275b400 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 12c03f59c3909159010b87a926f5626d4380d441
+refs/heads/master: 1ae9d2f4d776bd7e5f64d957216051cd36eb6802
diff --git a/trunk/drivers/net/Kconfig b/trunk/drivers/net/Kconfig
index c537f53ffcb9..8c5e8405fe09 100644
--- a/trunk/drivers/net/Kconfig
+++ b/trunk/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/trunk/drivers/net/smc911x.h b/trunk/drivers/net/smc911x.h
index 266232271a72..7cc7cd7e99cd 100644
--- a/trunk/drivers/net/smc911x.h
+++ b/trunk/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