From 340015690979d0995151d76a66c7ee3a9ee1d15b Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Sat, 7 Jan 2012 12:22:11 -0800
Subject: [PATCH] --- yaml --- r: 281963 b: refs/heads/master c:
 96dab45fc3eb732de7b7fe03d2250d3815af8929 h: refs/heads/master i:   281961:
 4c6a7e281bb1a55e2322d52437bd7890174828e8   281959:
 8d7e6590a93ecd508a831b31a26ea6123ebb6075 v: v3

---
 [refs]                                     | 2 +-
 trunk/drivers/net/ethernet/smsc/smsc911x.h | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

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__ */