Commit 261f6f68 authored by Uwe Kleine-König's avatar Uwe Kleine-König
Browse files

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



Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
parent 2f6c97c4

arch/arm/mach-mx25/mach-mx25pdk.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

arch/arm/plat-mxc/include/mach/iomux.h

+0 −4
Original line number Diff line number Diff line
@@ -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)