Parcourir la source

arm/mx25: don't include iomux.h which is for iomux-v1 machines

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Uwe Kleine-König il y a 15 ans
Parent
commit
261f6f681c
2 fichiers modifiés avec 1 ajouts et 5 suppressions
  1. 1 1
      arch/arm/mach-mx25/mach-mx25pdk.c
  2. 0 4
      arch/arm/plat-mxc/include/mach/iomux.h

+ 1 - 1
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,

+ 0 - 4
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)