summaryrefslogtreecommitdiff
path: root/arch/arm/mach-imx/cpu_op-mx51.h
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2011-11-07 15:36:48 +0400
committerSascha Hauer <s.hauer@pengutronix.de>2011-11-16 11:37:37 +0400
commit784a90c0a7d8f5aa94b6c7d295ad44ae8e045aa3 (patch)
treee28d645f519b5bd86df3ae6f5d06704b1755f09b /arch/arm/mach-imx/cpu_op-mx51.h
parent035c17dac4ce1f03d6831ff403f5aea7dcb927b4 (diff)
downloadlinux-784a90c0a7d8f5aa94b6c7d295ad44ae8e045aa3.tar.xz
ARM i.MX: Merge i.MX5 support into mach-imx
This patch moves the contents of arch/arm/mach-mx5 to arch/arm/mach-imx and adjusts the Makefile/Kconfig entries in a way that it's possible to compile i.MX5 together with i.MX3/6. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Tested-by: Shawn Guo <shawn.guo@linaro.org> Tested-by: Dirk Behme <dirk.behme@de.bosch.com>
Diffstat (limited to 'arch/arm/mach-imx/cpu_op-mx51.h')
-rw-r--r--arch/arm/mach-imx/cpu_op-mx51.h14
1 files changed, 14 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/cpu_op-mx51.h b/arch/arm/mach-imx/cpu_op-mx51.h
new file mode 100644
index 000000000000..97477fecb469
--- /dev/null
+++ b/arch/arm/mach-imx/cpu_op-mx51.h
@@ -0,0 +1,14 @@
+/*
+ * Copyright (C) 2010 Freescale Semiconductor, Inc. All Rights Reserved.
+ */
+
+/*
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 or later at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+extern struct cpu_op *mx51_get_cpu_op(int *op);