Merge branches 'cleanups/assorted' and 'cleanups/mm-tzic' into imx-cleanup
authorSascha Hauer <s.hauer@pengutronix.de>
Tue, 20 Sep 2011 08:09:08 +0000 (10:09 +0200)
committerSascha Hauer <s.hauer@pengutronix.de>
Tue, 20 Sep 2011 08:09:08 +0000 (10:09 +0200)
Conflicts:
arch/arm/mach-mx5/Makefile

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
1  2  3 
arch/arm/mach-mx5/Makefile
arch/arm/mach-mx5/mm.c
arch/arm/plat-mxc/include/mach/hardware.h
arch/arm/plat-mxc/include/mach/mx51.h

index 7f452433a6908f88831076b03bbf69744443a4f0,383e7cd3fbcb5b711783706ceeea2e605e0777b2,60f756db8d7635b5ea98218eb5cbb723918468d6..9565304b72820f9defbe3b18ce505c6adea3ba47
@@@@ -3,8 -3,8 -3,7 +3,7 @@@@
   #
   
   # Object file lists.
 --obj-y   := cpu.o mm.o clock-mx51-mx53.o devices.o ehci.o system.o
 - obj-$(CONFIG_SOC_IMX50) += mm-mx50.o
 ++obj-y   := cpu.o mm.o clock-mx51-mx53.o ehci.o system.o
-  obj-$(CONFIG_SOC_IMX50) += mm-mx50.o
   
   obj-$(CONFIG_PM) += pm-imx5.o
   obj-$(CONFIG_CPU_FREQ_IMX)    += cpu_op-mx51.o
Simple merge
Simple merge