diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2011-11-07 12:36:48 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-11-16 08:37:37 +0100 |
| commit | 784a90c0a7d8f5aa94b6c7d295ad44ae8e045aa3 (patch) | |
| tree | e28d645f519b5bd86df3ae6f5d06704b1755f09b /arch/arm/mach-mx5/cpu_op-mx51.h | |
| parent | 035c17dac4ce1f03d6831ff403f5aea7dcb927b4 (diff) | |
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-mx5/cpu_op-mx51.h')
| -rw-r--r-- | arch/arm/mach-mx5/cpu_op-mx51.h | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/arch/arm/mach-mx5/cpu_op-mx51.h b/arch/arm/mach-mx5/cpu_op-mx51.h deleted file mode 100644 index 97477fecb46..00000000000 --- a/arch/arm/mach-mx5/cpu_op-mx51.h +++ /dev/null @@ -1,14 +0,0 @@ -/* - * 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); |