aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-08-14 22:52:04 -0700
committerDavid S. Miller <davem@davemloft.net>2011-08-14 22:52:04 -0700
commit2bb698412d8aab0bfc3f269f5ebe8eb67d7cc8f4 (patch)
tree641177b2577c01119a8a25430f363963e9c20e66
parentqeth: add support for af_iucv HiperSockets transport (diff)
downloadlinux-dev-2bb698412d8aab0bfc3f269f5ebe8eb67d7cc8f4.tar.xz
linux-dev-2bb698412d8aab0bfc3f269f5ebe8eb67d7cc8f4.zip
net: Move sungem_phy.h under include/linux
Fixes build failures of the spider_net driver because it tries to use a convoluted path to include this header. Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/sun/sungem.c2
-rw-r--r--drivers/net/ethernet/toshiba/spider_net.h2
-rw-r--r--include/linux/sungem_phy.h (renamed from drivers/net/ethernet/sun/sungem_phy.h)0
3 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/sun/sungem.c b/drivers/net/ethernet/sun/sungem.c
index ade35dde5b51..0f13c5daf3fb 100644
--- a/drivers/net/ethernet/sun/sungem.c
+++ b/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/drivers/net/ethernet/toshiba/spider_net.h b/drivers/net/ethernet/toshiba/spider_net.h
index a891ad00054b..4ba2135474d1 100644
--- a/drivers/net/ethernet/toshiba/spider_net.h
+++ b/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/drivers/net/ethernet/sun/sungem_phy.h b/include/linux/sungem_phy.h
index af02f9479cbb..af02f9479cbb 100644
--- a/drivers/net/ethernet/sun/sungem_phy.h
+++ b/include/linux/sungem_phy.h