diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2016-05-09 08:49:42 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2016-05-09 08:49:42 +0200 |
| commit | 854df603da65bc56fe72218b402903f26155b0f0 (patch) | |
| tree | fb8b389859b17f86f3ef9a9c26909695991fcd82 /drivers/net | |
| parent | 55aca0a48c5cb68eeddf723a5bc69fc052071e61 (diff) | |
| parent | dd8244a422bce7ff9ff79ab1ca2632e1aad6e35a (diff) | |
| download | barebox-854df603da65bc56fe72218b402903f26155b0f0.tar.gz barebox-854df603da65bc56fe72218b402903f26155b0f0.tar.xz | |
Merge branch 'for-next/include-pdata'
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/davinci_emac.c | 2 | ||||
| -rw-r--r-- | drivers/net/designware.c | 2 | ||||
| -rw-r--r-- | drivers/net/dm9k.c | 2 | ||||
| -rw-r--r-- | drivers/net/ep93xx.c | 2 | ||||
| -rw-r--r-- | drivers/net/fec_imx.c | 2 | ||||
| -rw-r--r-- | drivers/net/fec_mpc5200.c | 2 | ||||
| -rw-r--r-- | drivers/net/smc91111.c | 2 | ||||
| -rw-r--r-- | drivers/net/smc911x.c | 2 |
8 files changed, 8 insertions, 8 deletions
diff --git a/drivers/net/davinci_emac.c b/drivers/net/davinci_emac.c index 3dc4b16b67..75a917a76d 100644 --- a/drivers/net/davinci_emac.c +++ b/drivers/net/davinci_emac.c @@ -49,7 +49,7 @@ #include <asm/system.h> #include <linux/phy.h> #include <mach/emac_defs.h> -#include <net/davinci_emac.h> +#include <platform_data/eth-davinci-emac.h> #include "davinci_emac.h" struct davinci_emac_priv { diff --git a/drivers/net/designware.c b/drivers/net/designware.c index 3b21244478..1d662a71d9 100644 --- a/drivers/net/designware.c +++ b/drivers/net/designware.c @@ -27,7 +27,7 @@ #include <io.h> #include <net.h> #include <of_net.h> -#include <net/designware.h> +#include <platform_data/eth-designware.h> #include <linux/phy.h> #include <linux/err.h> #include "designware.h" diff --git a/drivers/net/dm9k.c b/drivers/net/dm9k.c index ad402e3efc..acc0abbc48 100644 --- a/drivers/net/dm9k.c +++ b/drivers/net/dm9k.c @@ -29,7 +29,7 @@ #include <net.h> #include <io.h> #include <xfuncs.h> -#include <dm9000.h> +#include <platform_data/eth-dm9000.h> #include <errno.h> #include <linux/phy.h> diff --git a/drivers/net/ep93xx.c b/drivers/net/ep93xx.c index 0acb9b692f..fd725a56ee 100644 --- a/drivers/net/ep93xx.c +++ b/drivers/net/ep93xx.c @@ -38,7 +38,7 @@ #include <linux/types.h> #include <mach/ep93xx-regs.h> #include <linux/phy.h> -#include <net/ep93xx_eth.h> +#include <platform_data/eth-ep93xx.h> #include "ep93xx.h" #define EP93XX_MAX_PKT_SIZE 1536 diff --git a/drivers/net/fec_imx.c b/drivers/net/fec_imx.c index 83fdec66d7..8bc7c2993a 100644 --- a/drivers/net/fec_imx.c +++ b/drivers/net/fec_imx.c @@ -20,7 +20,7 @@ #include <net.h> #include <init.h> #include <driver.h> -#include <fec.h> +#include <platform_data/eth-fec.h> #include <io.h> #include <clock.h> #include <xfuncs.h> diff --git a/drivers/net/fec_mpc5200.c b/drivers/net/fec_mpc5200.c index bb57c34502..b99c23f7d4 100644 --- a/drivers/net/fec_mpc5200.c +++ b/drivers/net/fec_mpc5200.c @@ -10,7 +10,7 @@ #include <mach/mpc5xxx.h> #include <malloc.h> #include <net.h> -#include <fec.h> +#include <platform_data/eth-fec.h> #include <init.h> #include <driver.h> #include <mach/sdma.h> diff --git a/drivers/net/smc91111.c b/drivers/net/smc91111.c index b7055910eb..e08e3dd1b5 100644 --- a/drivers/net/smc91111.c +++ b/drivers/net/smc91111.c @@ -67,7 +67,7 @@ #include <io.h> #include <linux/phy.h> #include <linux/err.h> -#include <net/smc91111.h> +#include <platform_data/eth-smc91111.h> /*--------------------------------------------------------------- . diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c index 9b1a38ae21..fe9d1df502 100644 --- a/drivers/net/smc911x.c +++ b/drivers/net/smc911x.c @@ -28,7 +28,7 @@ #include <errno.h> #include <clock.h> #include <io.h> -#include <smc911x.h> +#include <platform_data/eth-smc911x.h> #include <linux/phy.h> #include "smc911x.h" |