Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9b1489e9 authored Feb 25, 2010 by Uwe Kleine-König

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>

parents bac3fcfa 08268b78

MAINTAINERS

+6 −0

Original line number	Diff line number	Diff line
		@@ -663,6 +663,12 @@ T: git://git.pengutronix.de/git/imx/linux-2.6.git
		F: arch/arm/mach-mx*/
		F: arch/arm/plat-mxc/

		ARM/FREESCALE IMX51
		M: Amit Kucheria <amit.kucheria@canonical.com>
		L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
		S: Maintained
		F: arch/arm/mach-mx5/

		ARM/GLOMATION GESBC9312SX MACHINE SUPPORT
		M: Lennert Buytenhek <kernel@wantstofly.org>
		L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

arch/arm/Makefile

+1 −0

Original line number	Diff line number	Diff line
		@@ -146,6 +146,7 @@ machine-$(CONFIG_ARCH_MX1) := mx1
		machine-$(CONFIG_ARCH_MX2) := mx2
		machine-$(CONFIG_ARCH_MX25) := mx25
		machine-$(CONFIG_ARCH_MX3) := mx3
		machine-$(CONFIG_ARCH_MX5) := mx5
		machine-$(CONFIG_ARCH_NETX) := netx
		machine-$(CONFIG_ARCH_NOMADIK) := nomadik
		machine-$(CONFIG_ARCH_NS9XXX) := ns9xxx