Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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 03e09cd. arch/arm/plat-mxc/iomux-mx1-mx2.c was moved to arch/arm/plat-mxc/iomux-v1.c in 5e2e95f and got bug fixed in 5c17ef8. The bug in arch/arm/plat-mxc/iomux-v1.c isn't present any more since bac3fcf, 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>
- Loading branch information