]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
smsc911x: Unconditionally include linux/smscphy.h in smsc911x.h
authorDavid S. Miller <davem@davemloft.net>
Sat, 7 Jan 2012 20:22:11 +0000 (12:22 -0800)
committerDavid S. Miller <davem@davemloft.net>
Sat, 7 Jan 2012 20:22:11 +0000 (12:22 -0800)
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>
drivers/net/ethernet/smsc/smsc911x.h

index 938ecf290813d1140d3c15bdb2b9b8cf8ffffd52..9ad5e5d39a03823c4389ee5842d0ecdd0b6db5fc 100644 (file)
 #include <asm/smsc911x.h>
 #endif
 
-#ifdef CONFIG_SMSC_PHY
 #include <linux/smscphy.h>
-#endif
 
 #endif                         /* __SMSC911X_H__ */