diff options
| author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-02-25 14:01:49 +0100 |
|---|---|---|
| committer | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-02-25 14:01:49 +0100 |
| commit | 9b1489e989695c4d502865f8bec616c0f17e99ab (patch) | |
| tree | 9f90bcc7491bec06db0463d5f24f1ac19b8becc4 /net/irda | |
| parent | bac3fcfad565c9bbceeed8b607f140c29df97355 (diff) | |
| parent | 08268b78d6f0c659dc1d86453c57b336f6f4f9ae (diff) | |
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 03e09cd8902717b66f940357257d8ad76114d9f2.
arch/arm/plat-mxc/iomux-mx1-mx2.c was moved to
arch/arm/plat-mxc/iomux-v1.c in 5e2e95f520538e095d10456acd28d9107317aa32
and got bug fixed in 5c17ef878fa25e04b1e8f1d8f5fa8b267753472c. The bug
in arch/arm/plat-mxc/iomux-v1.c isn't present any more since
bac3fcfad565c9bbceeed8b607f140c29df97355, 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>
Diffstat (limited to 'net/irda')
0 files changed, 0 insertions, 0 deletions