From: David S. Miller <davem@davemloft.net>
Date: Sat, 7 Jan 2012 20:22:11 +0000 (-0800)
Subject: smsc911x: Unconditionally include linux/smscphy.h in smsc911x.h
X-Git-Tag: Ubuntu-5.0.0-8.9~17012^2~10
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=96dab45fc3eb732de7b7fe03d2250d3815af8929;p=mirror_ubuntu-disco-kernel.git

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>
---

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