From: Andrew Morton <akpm@osdl.org>

Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 include/linux/phy.h |    2 ++
 1 file changed, 2 insertions(+)

diff -puN include/linux/phy.h~git-netdev-all-fixup include/linux/phy.h
--- a/include/linux/phy.h~git-netdev-all-fixup
+++ a/include/linux/phy.h
@@ -22,6 +22,8 @@
 #include <linux/device.h>
 #include <linux/ethtool.h>
 #include <linux/mii.h>
+#include <linux/timer.h>
+#include <linux/workqueue.h>
 #include <asm/irq.h>
 
 #define PHY_BASIC_FEATURES	(SUPPORTED_10baseT_Half | \
_