summaryrefslogtreecommitdiff
path: root/arch/arm/include
diff options
context:
space:
mode:
authorTroy Kisky <troy.kisky@boundarydevices.com>2012-07-19 08:18:22 +0000
committerHeiko Schocher <hs@denx.de>2012-07-31 08:00:19 +0200
commitaf2a35fb1f432c78e6181172ff4df34d37ff5154 (patch)
tree585cac93f8e26a2592337e8eeaa4c137711bc2e4 /arch/arm/include
parentd3394ec198f107a11a21402cbb3bd34b843a40ed (diff)
downloadu-boot-imx-af2a35fb1f432c78e6181172ff4df34d37ff5154.zip
u-boot-imx-af2a35fb1f432c78e6181172ff4df34d37ff5154.tar.gz
u-boot-imx-af2a35fb1f432c78e6181172ff4df34d37ff5154.tar.bz2
i.mx: iomux-v3.h: move to imx-common include directory
Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com>
Diffstat (limited to 'arch/arm/include')
-rw-r--r--arch/arm/include/asm/arch-mx6/mx6x_pins.h2
-rw-r--r--arch/arm/include/asm/imx-common/iomux-v3.h (renamed from arch/arm/include/asm/arch-mx6/iomux-v3.h)0
2 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/asm/arch-mx6/mx6x_pins.h b/arch/arm/include/asm/arch-mx6/mx6x_pins.h
index cf9103c..3d66d64 100644
--- a/arch/arm/include/asm/arch-mx6/mx6x_pins.h
+++ b/arch/arm/include/asm/arch-mx6/mx6x_pins.h
@@ -22,7 +22,7 @@
#ifndef __ASM_ARCH_MX6_MX6X_PINS_H__
#define __ASM_ARCH_MX6_MX6X_PINS_H__
-#include <asm/arch/iomux-v3.h>
+#include <asm/imx-common/iomux-v3.h>
/* Use to set PAD control */
#define PAD_CTL_HYS (1 << 16)
diff --git a/arch/arm/include/asm/arch-mx6/iomux-v3.h b/arch/arm/include/asm/imx-common/iomux-v3.h
index 788b413..788b413 100644
--- a/arch/arm/include/asm/arch-mx6/iomux-v3.h
+++ b/arch/arm/include/asm/imx-common/iomux-v3.h