diff options
| author | Tom Rini <trini@konsulko.com> | 2018-11-14 11:30:07 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-11-14 11:30:07 -0500 |
| commit | 208ecbad2ea83333e8f3c9933213867addf16f4a (patch) | |
| tree | 7af7000318ac1987179fc398a267caf1cac13af8 /arch/arm/mach-davinci | |
| parent | 0157013f4a4945bbdb70bb4d98d680e0845fd784 (diff) | |
| parent | 9e2a90280939fd896eb7af5db49c0410d5bd8420 (diff) | |
Merge branch 'next'
This brings in the u-boot-net PR from Joe.
Diffstat (limited to 'arch/arm/mach-davinci')
| -rw-r--r-- | arch/arm/mach-davinci/dp83848.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-davinci/et1011c.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-davinci/ksz8873.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-davinci/lxt972.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-davinci/dp83848.c b/arch/arm/mach-davinci/dp83848.c index 595e3ca149..7115d7bad2 100644 --- a/arch/arm/mach-davinci/dp83848.c +++ b/arch/arm/mach-davinci/dp83848.c @@ -12,7 +12,7 @@ #include <net.h> #include <dp83848.h> #include <asm/arch/emac_defs.h> -#include "../../../drivers/net/davinci_emac.h" +#include "../../../drivers/net/ti/davinci_emac.h" #ifdef CONFIG_DRIVER_TI_EMAC diff --git a/arch/arm/mach-davinci/et1011c.c b/arch/arm/mach-davinci/et1011c.c index 3d02274810..bfb7ff2689 100644 --- a/arch/arm/mach-davinci/et1011c.c +++ b/arch/arm/mach-davinci/et1011c.c @@ -9,7 +9,7 @@ #include <net.h> #include <miiphy.h> #include <asm/arch/emac_defs.h> -#include "../../../drivers/net/davinci_emac.h" +#include "../../../drivers/net/ti/davinci_emac.h" #ifdef CONFIG_DRIVER_TI_EMAC diff --git a/arch/arm/mach-davinci/ksz8873.c b/arch/arm/mach-davinci/ksz8873.c index 899cff0169..85b0c2620c 100644 --- a/arch/arm/mach-davinci/ksz8873.c +++ b/arch/arm/mach-davinci/ksz8873.c @@ -19,7 +19,7 @@ #include <net.h> #include <asm/arch/emac_defs.h> #include <asm/io.h> -#include "../../../drivers/net/davinci_emac.h" +#include "../../../drivers/net/ti/davinci_emac.h" int ksz8873_is_phy_connected(int phy_addr) { diff --git a/arch/arm/mach-davinci/lxt972.c b/arch/arm/mach-davinci/lxt972.c index 170e4a5783..b54f67dbfe 100644 --- a/arch/arm/mach-davinci/lxt972.c +++ b/arch/arm/mach-davinci/lxt972.c @@ -13,7 +13,7 @@ #include <miiphy.h> #include <lxt971a.h> #include <asm/arch/emac_defs.h> -#include "../../../drivers/net/davinci_emac.h" +#include "../../../drivers/net/ti/davinci_emac.h" #ifdef CONFIG_DRIVER_TI_EMAC |