From f8a8bb566dea66e91eafae0d64bd9ae1542586f7 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Sun, 14 Aug 2011 22:52:04 -0700 Subject: [PATCH] --- yaml --- r: 265301 b: refs/heads/master c: 2bb698412d8aab0bfc3f269f5ebe8eb67d7cc8f4 h: refs/heads/master i: 265299: cf699d4328342efd0e9c2f9c5e63834034a84a92 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/sun/sungem.c | 2 +- trunk/drivers/net/ethernet/toshiba/spider_net.h | 2 +- trunk/{drivers/net/ethernet/sun => include/linux}/sungem_phy.h | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename trunk/{drivers/net/ethernet/sun => include/linux}/sungem_phy.h (100%) 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 #endif -#include "sungem_phy.h" +#include #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 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