diff --git a/[refs] b/[refs]
index db95ff6aff4b..f73bf50cffbc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b333293058aa2d401737c7246bce58f8ba00906d
+refs/heads/master: 2bb698412d8aab0bfc3f269f5ebe8eb67d7cc8f4
diff --git a/trunk/drivers/net/ethernet/sun/sungem.c b/trunk/drivers/net/ethernet/sun/sungem.c
index ade35dde5b51..0f13c5daf3fb 100644
--- a/trunk/drivers/net/ethernet/sun/sungem.c
+++ b/trunk/drivers/net/ethernet/sun/sungem.c
@@ -59,7 +59,7 @@
 #include <asm/pmac_feature.h>
 #endif
 
-#include "sungem_phy.h"
+#include <linux/sungem_phy.h>
 #include "sungem.h"
 
 /* Stripping FCS is causing problems, disabled for now */
diff --git a/trunk/drivers/net/ethernet/toshiba/spider_net.h b/trunk/drivers/net/ethernet/toshiba/spider_net.h
index a891ad00054b..4ba2135474d1 100644
--- a/trunk/drivers/net/ethernet/toshiba/spider_net.h
+++ b/trunk/drivers/net/ethernet/toshiba/spider_net.h
@@ -27,7 +27,7 @@
 
 #define VERSION "2.0 B"
 
-#include "./ethernet/sun/sungem_phy.h"
+#include <linux/sungem_phy.h>
 
 extern int spider_net_stop(struct net_device *netdev);
 extern int spider_net_open(struct net_device *netdev);
diff --git a/trunk/drivers/net/ethernet/sun/sungem_phy.h b/trunk/include/linux/sungem_phy.h
similarity index 100%
rename from trunk/drivers/net/ethernet/sun/sungem_phy.h
rename to trunk/include/linux/sungem_phy.h