diff --git a/[refs] b/[refs]
index b50f4d5f5915..a02adce1bc15 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dcf777f6ed9799c5ac90ac17a5c369e6b73ca92e
+refs/heads/master: 4a29f396429132dc59f1856ea6cfc860a1955fa1
diff --git a/trunk/drivers/net/smc91x.h b/trunk/drivers/net/smc91x.h
index f1f773b17fe1..57a159fac99f 100644
--- a/trunk/drivers/net/smc91x.h
+++ b/trunk/drivers/net/smc91x.h
@@ -186,7 +186,8 @@ static inline void SMC_outw(u16 val, void __iomem *ioaddr, int reg)
 #define SMC_outsb(a, r, p, l)	writesb((a) + (r), p, (l))
 #define SMC_IRQ_FLAGS		(-1)	/* from resource */
 
-#elif	defined(CONFIG_MACH_LOGICPD_PXA270)
+#elif	defined(CONFIG_MACH_LOGICPD_PXA270) \
+	|| defined(CONFIG_MACH_NOMADIK_8815NHK)
 
 #define SMC_CAN_USE_8BIT	0
 #define SMC_CAN_USE_16BIT	1