diff options
| author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-02-15 21:18:43 +0100 |
|---|---|---|
| committer | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-02-24 10:07:14 +0100 |
| commit | 261f6f681ced65de82a619f6802ebe82fd9af080 (patch) | |
| tree | 870d9f6b1f71687fcbba4e5ec56789d14e0c6dec | |
| parent | 2f6c97c48e727d1bbd3131527380da19161f6f5f (diff) | |
| download | blackbird-op-linux-261f6f681ced65de82a619f6802ebe82fd9af080.tar.gz blackbird-op-linux-261f6f681ced65de82a619f6802ebe82fd9af080.zip | |
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>
| -rw-r--r-- | arch/arm/mach-mx25/mach-mx25pdk.c | 2 | ||||
| -rw-r--r-- | arch/arm/plat-mxc/include/mach/iomux.h | 4 |
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 @@ #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/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 @@ #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) |
