diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-03-28 14:18:11 +0000 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-03-28 14:18:11 +0000 |
commit | fd775c084ee55c046548616ca6b510c46d29f208 (patch) | |
tree | 36791c2b682950e7594747d12c44e30beb91a826 /arch/arm/mach-mx2/Makefile | |
parent | dc52b5bf2c94828fd3c8d26f4ca810d4ba53999a (diff) | |
parent | 4d1e4e5a6387aad97590e2da9c6db1350f22f63a (diff) |
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel
Diffstat (limited to 'arch/arm/mach-mx2/Makefile')
-rw-r--r-- | arch/arm/mach-mx2/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-mx2/Makefile b/arch/arm/mach-mx2/Makefile index 6e1a2bffc812..950649a91540 100644 --- a/arch/arm/mach-mx2/Makefile +++ b/arch/arm/mach-mx2/Makefile @@ -4,7 +4,7 @@ # Object file lists. -obj-y := system.o generic.o devices.o serial.o +obj-y := generic.o devices.o serial.o obj-$(CONFIG_MACH_MX21) += clock_imx21.o |