diff options
author | Paul Mundt <lethal@linux-sh.org> | 2011-03-31 08:39:47 +0200 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2011-03-31 08:39:47 +0200 |
commit | 7ea5db8efeac8627500e012aa6829ca612c5a700 (patch) | |
tree | 90e4de22f60b989dcf0f0d7436978c0b463d5827 /arch/arm/mach-mx5/Makefile | |
parent | sh: landisk: Remove whitespace (diff) | |
parent | Merge branch 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kern... (diff) | |
download | linux-7ea5db8efeac8627500e012aa6829ca612c5a700.tar.xz linux-7ea5db8efeac8627500e012aa6829ca612c5a700.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh-latest
Diffstat (limited to 'arch/arm/mach-mx5/Makefile')
-rw-r--r-- | arch/arm/mach-mx5/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-mx5/Makefile b/arch/arm/mach-mx5/Makefile index 4f63048be3ca..0b9338cec516 100644 --- a/arch/arm/mach-mx5/Makefile +++ b/arch/arm/mach-mx5/Makefile @@ -3,7 +3,7 @@ # # Object file lists. -obj-y := cpu.o mm.o clock-mx51-mx53.o devices.o ehci.o +obj-y := cpu.o mm.o clock-mx51-mx53.o devices.o ehci.o system.o obj-$(CONFIG_SOC_IMX50) += mm-mx50.o obj-$(CONFIG_CPU_FREQ_IMX) += cpu_op-mx51.o |