diff options
| author | Tom Rini <trini@konsulko.com> | 2019-08-12 18:46:07 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-08-12 18:46:07 -0400 |
| commit | 5939afc9611e8ba4a86b96e67670b765ee27668e (patch) | |
| tree | 369402e0305a7b8f9f905baec6387bfd9683ba71 /arch/arm/mach-omap2 | |
| parent | d7ae932152ddf58125a05f4eb28596d9b31bdb1e (diff) | |
| parent | ec1fa18561f818bee252da2c331d371ad26037d2 (diff) | |
Merge branch '2019-08-11-master-imports'
- environment cleanup
- HiKey 960 support
- Some PCI fixes
Diffstat (limited to 'arch/arm/mach-omap2')
| -rw-r--r-- | arch/arm/mach-omap2/boot-common.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/omap3/clock.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/utils.c | 2 |
3 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/boot-common.c b/arch/arm/mach-omap2/boot-common.c index c8b8ac657f..eb8c5843fa 100644 --- a/arch/arm/mach-omap2/boot-common.c +++ b/arch/arm/mach-omap2/boot-common.c @@ -9,7 +9,6 @@ #include <common.h> #include <ahci.h> -#include <environment.h> #include <spl.h> #include <asm/omap_common.h> #include <asm/arch/omap.h> diff --git a/arch/arm/mach-omap2/omap3/clock.c b/arch/arm/mach-omap2/omap3/clock.c index cb9e91ebc3..71f73492c6 100644 --- a/arch/arm/mach-omap2/omap3/clock.c +++ b/arch/arm/mach-omap2/omap3/clock.c @@ -17,7 +17,6 @@ #include <asm/arch/clocks_omap3.h> #include <asm/arch/mem.h> #include <asm/arch/sys_proto.h> -#include <environment.h> #include <command.h> /****************************************************************************** diff --git a/arch/arm/mach-omap2/utils.c b/arch/arm/mach-omap2/utils.c index 7d01446940..0d5ca20e8e 100644 --- a/arch/arm/mach-omap2/utils.c +++ b/arch/arm/mach-omap2/utils.c @@ -4,7 +4,7 @@ * Aneesh V <aneesh@ti.com> */ #include <common.h> -#include <environment.h> +#include <env.h> #include <asm/setup.h> #include <asm/arch/sys_proto.h> #include <asm/omap_common.h> |