From a2c2d3b335d32cac2fc57d1393379d0818b30205 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= <u.kleine-koenig@pengutronix.de>
Date: Mon, 15 Feb 2010 21:18:43 +0100
Subject: [PATCH] --- yaml --- r: 187564 b: refs/heads/master c:
 261f6f681ced65de82a619f6802ebe82fd9af080 h: refs/heads/master v: v3

---
 [refs]                                       | 2 +-
 trunk/arch/arm/mach-mx25/mach-mx25pdk.c      | 2 +-
 trunk/arch/arm/plat-mxc/include/mach/iomux.h | 4 ----
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index ade6f91309c3..d599ec068e6f 100644
--- 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
index 10be38eb82a8..cb85e2e7961a 100644
--- 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
index e15d28aaab83..8b2467f300b0 100644
--- 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)