diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2010-02-04 11:18:09 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2010-02-04 11:18:09 +0100 |
| commit | 9fd96bbb6a3a1fd9ba24e84a2d7ccc6ccb6beb60 (patch) | |
| tree | b0f46e9a9164f75efb59ca241ca16b6ce03be0b6 /arch/arm/mach-mx25/Makefile | |
| parent | 5c17ef878fa25e04b1e8f1d8f5fa8b267753472c (diff) | |
| parent | e27bf72465f4d867a2aea33cad5e9e255c4d92ff (diff) | |
Merge branch 'imx/master' of git://git.pengutronix.de/git/ukl/linux-2.6 into mxc-master
Diffstat (limited to 'arch/arm/mach-mx25/Makefile')
| -rw-r--r-- | arch/arm/mach-mx25/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-mx25/Makefile b/arch/arm/mach-mx25/Makefile index fe23836a9f3..10cebc5ced8 100644 --- a/arch/arm/mach-mx25/Makefile +++ b/arch/arm/mach-mx25/Makefile @@ -1,3 +1,3 @@ obj-y := mm.o devices.o obj-$(CONFIG_ARCH_MX25) += clock.o -obj-$(CONFIG_MACH_MX25_3DS) += mx25pdk.o +obj-$(CONFIG_MACH_MX25_3DS) += mach-mx25pdk.o |