projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6c15d74
)
smsc911x: Unconditionally include linux/smscphy.h in smsc911x.h
author
David S. Miller
<
[email protected]
>
Sat, 7 Jan 2012 20:22:11 +0000
(12:22 -0800)
committer
David S. Miller
<
[email protected]
>
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 <
[email protected]
>
Signed-off-by: David S. Miller <
[email protected]
>
drivers/net/ethernet/smsc/smsc911x.h
patch
|
blob
|
history
diff --git
a/drivers/net/ethernet/smsc/smsc911x.h
b/drivers/net/ethernet/smsc/smsc911x.h
index 938ecf290813d1140d3c15bdb2b9b8cf8ffffd52..9ad5e5d39a03823c4389ee5842d0ecdd0b6db5fc 100644
(file)
--- 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__ */