[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <1287525423-22329-1-git-send-email-Dinh.Nguyen@freescale.com>
Date: Tue, 19 Oct 2010 16:57:03 -0500
From: <Dinh.Nguyen@...escale.com>
To: <linux-kernel@...r.kernel.org>
CC: <linux-arm-kernel@...ts.infradead.org>, <linux@....linux.org.uk>,
<s.hauer@...gutronix.de>, <u.kleine-koenig@...gutronix.de>,
<valentin.longchamp@...l.ch>, <daniel@...aq.de>,
<grant.likely@...retlab.ca>, <amit.kucheria@...onical.com>,
<xiao-lizhang@...escale.com>,
Dinh Nguyen <Dinh.Nguyen@...escale.com>
Subject: [PATCH] ARM: imx: change mx51.h into mx5x.h
From: Dinh Nguyen <Dinh.Nguyen@...escale.com>
In preparation for submitting i.MX53 support, change mx51.h to
mx5x.h so that mx5x.h can contain MX53 information as well.
Signed-off-by: Dinh Nguyen <Dinh.Nguyen@...escale.com>
---
arch/arm/mach-mx5/devices-imx51.h | 2 +-
arch/arm/plat-mxc/include/mach/debug-macro.S | 2 +-
arch/arm/plat-mxc/include/mach/hardware.h | 2 +-
arch/arm/plat-mxc/include/mach/{mx51.h => mx5x.h} | 0
4 files changed, 3 insertions(+), 3 deletions(-)
rename arch/arm/plat-mxc/include/mach/{mx51.h => mx5x.h} (100%)
diff --git a/arch/arm/mach-mx5/devices-imx51.h b/arch/arm/mach-mx5/devices-imx51.h
index 5cc910e..f6abe2d 100644
--- a/arch/arm/mach-mx5/devices-imx51.h
+++ b/arch/arm/mach-mx5/devices-imx51.h
@@ -6,7 +6,7 @@
* the terms of the GNU General Public License version 2 as published by the
* Free Software Foundation.
*/
-#include <mach/mx51.h>
+#include <mach/mx5x.h>
#include <mach/devices-common.h>
extern const struct imx_fec_data imx51_fec_data __initconst;
diff --git a/arch/arm/plat-mxc/include/mach/debug-macro.S b/arch/arm/plat-mxc/include/mach/debug-macro.S
index 2560640..ac8a2bf 100644
--- a/arch/arm/plat-mxc/include/mach/debug-macro.S
+++ b/arch/arm/plat-mxc/include/mach/debug-macro.S
@@ -49,7 +49,7 @@
#ifdef UART_PADDR
#error "CONFIG_DEBUG_LL is incompatible with multiple archs"
#endif
-#include <mach/mx51.h>
+#include <mach/mx5x.h>
#define UART_PADDR MX51_UART1_BASE_ADDR
#define UART_VADDR MX51_AIPS1_IO_ADDRESS(MX51_UART1_BASE_ADDR)
#endif
diff --git a/arch/arm/plat-mxc/include/mach/hardware.h b/arch/arm/plat-mxc/include/mach/hardware.h
index ebadf4a..5a7395a 100644
--- a/arch/arm/plat-mxc/include/mach/hardware.h
+++ b/arch/arm/plat-mxc/include/mach/hardware.h
@@ -28,7 +28,7 @@
(addr) - (module ## _BASE_ADDR) + (module ## _BASE_ADDR_VIRT) : 0))
#ifdef CONFIG_ARCH_MX5
-#include <mach/mx51.h>
+#include <mach/mx5x.h>
#endif
#ifdef CONFIG_ARCH_MX3
diff --git a/arch/arm/plat-mxc/include/mach/mx51.h b/arch/arm/plat-mxc/include/mach/mx5x.h
similarity index 100%
rename from arch/arm/plat-mxc/include/mach/mx51.h
rename to arch/arm/plat-mxc/include/mach/mx5x.h
--
1.6.0.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists