---

yaml --- r: 187564 b: refs/heads/master c: 261f6f6 h: refs/heads/master v: v3
git-mirror · Feb 24, 2010 · a2c2d3b · a2c2d3b
1 parent dcfc680
commit a2c2d3b
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2f6c97c48e727d1bbd3131527380da19161f6f5f
+refs/heads/master: 261f6f681ced65de82a619f6802ebe82fd9af080
diff --git a/trunk/arch/arm/mach-mx25/mach-mx25pdk.c b/trunk/arch/arm/mach-mx25/mach-mx25pdk.c
@@ -36,7 +36,7 @@
 #include <mach/mx25.h>
 #include <mach/mxc_nand.h>
 #include "devices.h"
-#include <mach/iomux.h>
+#include <mach/iomux-mx25.h>
 
 static struct imxuart_platform_data uart_pdata = {
 	.flags = IMXUART_HAVE_RTSCTS,

diff --git a/trunk/arch/arm/plat-mxc/include/mach/iomux.h b/trunk/arch/arm/plat-mxc/include/mach/iomux.h
@@ -109,10 +109,6 @@
 #include <mach/iomux-mx27.h>
 #endif
 #endif
-#ifdef CONFIG_ARCH_MX25
-#include <mach/iomux-mx25.h>
-#endif
-
 
 /* decode irq number to use with IMR(x), ISR(x) and friends */
 #define IRQ_TO_REG(irq) ((irq - MXC_INTERNAL_IRQS) >> 5)