Merge branch 'mxc-master' of git://git.pengutronix.de/git/imx/linux-2.6 into imx/master
Removed selection of COMMON_CLKDEV by CONFIG_ARCH_MX5. This is handled in 03e09cd8. arch/arm/plat-mxc/iomux-mx1-mx2.c was moved to arch/arm/plat-mxc/iomux-v1.c in 5e2e95f5 and got bug fixed in 5c17ef87. The bug in arch/arm/plat-mxc/iomux-v1.c isn't present any more since bac3fcfa, so arch/arm/plat-mxc/iomux-mx1-mx2.c is simply deleted. Conflicts: arch/arm/plat-mxc/Kconfig arch/arm/plat-mxc/Makefile arch/arm/plat-mxc/iomux-mx1-mx2.c Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Showing
arch/arm/mach-mx5/Kconfig
0 → 100644
arch/arm/mach-mx5/Makefile
0 → 100644
arch/arm/mach-mx5/cpu.c
0 → 100644
arch/arm/mach-mx5/crm_regs.h
0 → 100644
arch/arm/mach-mx5/devices.c
0 → 100644
arch/arm/mach-mx5/devices.h
0 → 100644
arch/arm/mach-mx5/mm.c
0 → 100644
arch/arm/plat-mxc/tzic.c
0 → 100644
Please register or sign in to comment