summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx/mach-armadillo5x0.c
diff options
context:
space:
mode:
authorFabio Estevam <fabio.estevam@freescale.com>2012-01-20 19:43:09 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2012-02-27 10:14:48 +0100
commit29781fa6b6694ae6bf7342f07186df661adeec35 (patch)
tree23ee875cfe3b42a86c1cd4ab406f6164fc353bb3 /arch/arm/mach-imx/mach-armadillo5x0.c
parentARM: plat-mxc: audmux-v1: Remove unneeded ifdef's (diff)
downloadlinux-29781fa6b6694ae6bf7342f07186df661adeec35.tar.xz
linux-29781fa6b6694ae6bf7342f07186df661adeec35.zip
ARM: mx3: Let mx31 and mx35 share the same CCM header file
Let mx31 and mx35 share the same CCM header file Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-imx/mach-armadillo5x0.c')
-rw-r--r--arch/arm/mach-imx/mach-armadillo5x0.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/mach-armadillo5x0.c b/arch/arm/mach-imx/mach-armadillo5x0.c
index e4f426a09899..27bc27e6ea41 100644
--- a/arch/arm/mach-imx/mach-armadillo5x0.c
+++ b/arch/arm/mach-imx/mach-armadillo5x0.c
@@ -51,7 +51,7 @@
#include <mach/ulpi.h>
#include "devices-imx31.h"
-#include "crmregs-imx31.h"
+#include "crmregs-imx3.h"
static int armadillo5x0_pins[] = {
/* UART1 */