diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2023-03-16 15:12:51 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2023-03-16 15:12:51 +0100 |
| commit | 2d615bd09f629fda06b5c9006106915cd6783bcd (patch) | |
| tree | 2d1782e33b817b5631aa3ac354978240ae29469d /drivers/net | |
| parent | 363e4d17ef42894dec44c7bbadbcef8fa02735f0 (diff) | |
| parent | 58d7e12a8af61f26e04bb1c5933aa2d457774dcd (diff) | |
| download | barebox-2d615bd09f629fda06b5c9006106915cd6783bcd.tar.gz barebox-2d615bd09f629fda06b5c9006106915cd6783bcd.tar.xz | |
Merge branch 'for-next/arm' into next
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/at91_ether.c | 6 | ||||
| -rw-r--r-- | drivers/net/cpsw.c | 2 | ||||
| -rw-r--r-- | drivers/net/davinci_emac.c | 2 | ||||
| -rw-r--r-- | drivers/net/ep93xx.c | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/at91_ether.c b/drivers/net/at91_ether.c index 6cf700ad90..5cebb8b44c 100644 --- a/drivers/net/at91_ether.c +++ b/drivers/net/at91_ether.c @@ -15,9 +15,9 @@ #include <xfuncs.h> #include <init.h> #include <asm/io.h> -#include <mach/hardware.h> -#include <mach/at91rm9200_emac.h> -#include <mach/board.h> +#include <mach/at91/hardware.h> +#include <mach/at91/at91rm9200_emac.h> +#include <mach/at91/board.h> #include <generated/mach-types.h> #include <linux/clk.h> #include <linux/mii.h> diff --git a/drivers/net/cpsw.c b/drivers/net/cpsw.c index 82a1fb974e..eacb382afe 100644 --- a/drivers/net/cpsw.c +++ b/drivers/net/cpsw.c @@ -22,7 +22,7 @@ #include <asm/system.h> #include <linux/err.h> -#include <mach/cpsw.h> +#include <mach/omap/cpsw.h> #define CPSW_VERSION_1 0x19010a #define CPSW_VERSION_2 0x19010c diff --git a/drivers/net/davinci_emac.c b/drivers/net/davinci_emac.c index 2415aa7443..7f2e1af3f7 100644 --- a/drivers/net/davinci_emac.c +++ b/drivers/net/davinci_emac.c @@ -31,7 +31,7 @@ #include <init.h> #include <asm/system.h> #include <linux/phy.h> -#include <mach/emac_defs.h> +#include <mach/omap/emac_defs.h> #include <of_net.h> #include "davinci_emac.h" diff --git a/drivers/net/ep93xx.c b/drivers/net/ep93xx.c index ee650cdeea..77f8aa63db 100644 --- a/drivers/net/ep93xx.c +++ b/drivers/net/ep93xx.c @@ -21,7 +21,7 @@ #include <malloc.h> #include <io.h> #include <linux/types.h> -#include <mach/ep93xx-regs.h> +#include <mach/ep93xx/ep93xx-regs.h> #include <linux/phy.h> #include <platform_data/eth-ep93xx.h> #include "ep93xx.h" |