diff --git a/[refs] b/[refs] index 8a250f5463fc..95049637ff74 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8eac3f60acad6e05a938a3d5feef01cb367bde4a +refs/heads/master: d4fa0e35fdbd54acf791fa3793d6d17f7795f7ae diff --git a/trunk/drivers/net/ethernet/renesas/sh_eth.c b/trunk/drivers/net/ethernet/renesas/sh_eth.c index 38ccda55ea7e..6aa0704fc26a 100644 --- a/trunk/drivers/net/ethernet/renesas/sh_eth.c +++ b/trunk/drivers/net/ethernet/renesas/sh_eth.c @@ -35,6 +35,7 @@ #include #include #include +#include #include "sh_eth.h" diff --git a/trunk/drivers/net/ethernet/renesas/sh_eth.h b/trunk/drivers/net/ethernet/renesas/sh_eth.h index 78e586ecdeaa..47877b13ffad 100644 --- a/trunk/drivers/net/ethernet/renesas/sh_eth.h +++ b/trunk/drivers/net/ethernet/renesas/sh_eth.h @@ -23,14 +23,6 @@ #ifndef __SH_ETH_H__ #define __SH_ETH_H__ -#include -#include -#include -#include -#include - -#include - #define CARDNAME "sh-eth" #define TX_TIMEOUT (5*HZ) #define TX_RING_SIZE 64 /* Tx ring size */ diff --git a/trunk/arch/sh/include/asm/sh_eth.h b/trunk/include/linux/sh_eth.h similarity index 100% rename from trunk/arch/sh/include/asm/sh_eth.h rename to trunk/include/linux/sh_eth.h