diff --git a/[refs] b/[refs]
index cdf65cc21e8f..4973cc25a1f2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6c15d74defd38e7e7f8805392578b7a1d508097e
+refs/heads/master: 96dab45fc3eb732de7b7fe03d2250d3815af8929
diff --git a/trunk/drivers/net/ethernet/smsc/smsc911x.h b/trunk/drivers/net/ethernet/smsc/smsc911x.h
index 938ecf290813..9ad5e5d39a03 100644
--- a/trunk/drivers/net/ethernet/smsc/smsc911x.h
+++ b/trunk/drivers/net/ethernet/smsc/smsc911x.h
@@ -401,8 +401,6 @@
 #include <asm/smsc911x.h>
 #endif
 
-#ifdef CONFIG_SMSC_PHY
 #include <linux/smscphy.h>
-#endif
 
 #endif				/* __SMSC911X_H__ */