diff options
author | Tom Rini <trini@konsulko.com> | 2017-07-18 12:42:48 (GMT) |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2017-07-18 12:42:48 (GMT) |
commit | 39632b4a01210e329333d787d828157dcd2c7328 (patch) | |
tree | a1013e4161de425f81aea052eeabe572c5e557d3 /board/liebherr | |
parent | e14b1169c0c5a1b362b41451006b492bd16f2fff (diff) | |
parent | 651782a08b5bb4e710bda1b11fff774b8ade384f (diff) | |
download | u-boot-39632b4a01210e329333d787d828157dcd2c7328.tar.xz |
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
Diffstat (limited to 'board/liebherr')
-rw-r--r-- | board/liebherr/mccmon6/mccmon6.c | 8 | ||||
-rw-r--r-- | board/liebherr/mccmon6/spl.c | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/board/liebherr/mccmon6/mccmon6.c b/board/liebherr/mccmon6/mccmon6.c index eb5eae4..e265e2a 100644 --- a/board/liebherr/mccmon6/mccmon6.c +++ b/board/liebherr/mccmon6/mccmon6.c @@ -12,10 +12,10 @@ #include <asm/arch/mx6-pins.h> #include <asm/arch/sys_proto.h> #include <asm/gpio.h> -#include <asm/imx-common/iomux-v3.h> -#include <asm/imx-common/mxc_i2c.h> -#include <asm/imx-common/spi.h> -#include <asm/imx-common/boot_mode.h> +#include <asm/mach-imx/iomux-v3.h> +#include <asm/mach-imx/mxc_i2c.h> +#include <asm/mach-imx/spi.h> +#include <asm/mach-imx/boot_mode.h> #include <asm/io.h> #include <fsl_esdhc.h> #include <mmc.h> diff --git a/board/liebherr/mccmon6/spl.c b/board/liebherr/mccmon6/spl.c index 73beeaa..15844ef 100644 --- a/board/liebherr/mccmon6/spl.c +++ b/board/liebherr/mccmon6/spl.c @@ -11,8 +11,8 @@ #include <asm/arch/mx6-pins.h> #include <errno.h> #include <asm/gpio.h> -#include <asm/imx-common/iomux-v3.h> -#include <asm/imx-common/video.h> +#include <asm/mach-imx/iomux-v3.h> +#include <asm/mach-imx/video.h> #include <mmc.h> #include <fsl_esdhc.h> #include <asm/arch/crm_regs.h> |