diff options
| author | David S. Miller <davem@davemloft.net> | 2012-01-07 12:22:11 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-01-07 12:22:11 -0800 |
| commit | 96dab45fc3eb732de7b7fe03d2250d3815af8929 (patch) | |
| tree | 310743a99d434d4328b937273f6fcc6b56812cd1 /drivers | |
| parent | 6c15d74defd38e7e7f8805392578b7a1d508097e (diff) | |
| download | linux-stable-96dab45fc3eb732de7b7fe03d2250d3815af8929.tar.gz linux-stable-96dab45fc3eb732de7b7fe03d2250d3815af8929.tar.bz2 linux-stable-96dab45fc3eb732de7b7fe03d2250d3815af8929.zip | |
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')
| -rw-r--r-- | drivers/net/ethernet/smsc/smsc911x.h | 2 |
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__ */ |