summaryrefslogtreecommitdiff
path: root/drivers/net/ethernet/smsc
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2012-01-08 00:22:11 +0400
committerDavid S. Miller <davem@davemloft.net>2012-01-08 00:22:11 +0400
commit96dab45fc3eb732de7b7fe03d2250d3815af8929 (patch)
tree310743a99d434d4328b937273f6fcc6b56812cd1 /drivers/net/ethernet/smsc
parent6c15d74defd38e7e7f8805392578b7a1d508097e (diff)
downloadlinux-96dab45fc3eb732de7b7fe03d2250d3815af8929.tar.xz
smsc911x: Unconditionally include linux/smscphy.h in smsc911x.h
The energy detect enable/disable code in the driver uses some register defines in this header unconditionally, so guarding the smscphy.h header include with CONFIG_SMSC_PHY leads to build failures in some configurations. Reported-by: Shawn Guo <shawn.guo@linaro.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/smsc')
-rw-r--r--drivers/net/ethernet/smsc/smsc911x.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/ethernet/smsc/smsc911x.h b/drivers/net/ethernet/smsc/smsc911x.h
index 938ecf290813..9ad5e5d39a03 100644
--- a/drivers/net/ethernet/smsc/smsc911x.h
+++ b/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__ */