aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/mach-mx25/mach-mx25pdk.c2
-rw-r--r--arch/arm/plat-mxc/include/mach/iomux.h4
2 files changed, 1 insertions, 5 deletions
diff --git a/arch/arm/mach-mx25/mach-mx25pdk.c b/arch/arm/mach-mx25/mach-mx25pdk.c
index 10be38eb82a8..cb85e2e7961a 100644
--- a/arch/arm/mach-mx25/mach-mx25pdk.c
+++ b/arch/arm/mach-mx25/mach-mx25pdk.c
@@ -36,7 +36,7 @@
36#include <mach/mx25.h> 36#include <mach/mx25.h>
37#include <mach/mxc_nand.h> 37#include <mach/mxc_nand.h>
38#include "devices.h" 38#include "devices.h"
39#include <mach/iomux.h> 39#include <mach/iomux-mx25.h>
40 40
41static struct imxuart_platform_data uart_pdata = { 41static struct imxuart_platform_data uart_pdata = {
42 .flags = IMXUART_HAVE_RTSCTS, 42 .flags = IMXUART_HAVE_RTSCTS,
diff --git a/arch/arm/plat-mxc/include/mach/iomux.h b/arch/arm/plat-mxc/include/mach/iomux.h
index e15d28aaab83..8b2467f300b0 100644
--- a/arch/arm/plat-mxc/include/mach/iomux.h
+++ b/arch/arm/plat-mxc/include/mach/iomux.h
@@ -109,10 +109,6 @@
109#include <mach/iomux-mx27.h> 109#include <mach/iomux-mx27.h>
110#endif 110#endif
111#endif 111#endif
112#ifdef CONFIG_ARCH_MX25
113#include <mach/iomux-mx25.h>
114#endif
115
116 112
117/* decode irq number to use with IMR(x), ISR(x) and friends */ 113/* decode irq number to use with IMR(x), ISR(x) and friends */
118#define IRQ_TO_REG(irq) ((irq - MXC_INTERNAL_IRQS) >> 5) 114#define IRQ_TO_REG(irq) ((irq - MXC_INTERNAL_IRQS) >> 5)