diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-05-23 15:57:31 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-05-23 15:57:31 -0400 |
| commit | a2ab67fae1ab9226679495a8d260f4e6555efc5f (patch) | |
| tree | f7de683c9c8ff0869a7e11f1d40802145d05f5b4 /arch/arm/mach-mx3/Makefile | |
| parent | 6d0485a99366d4e0e7e725f14995c74cb7ca4499 (diff) | |
| parent | 135cad366b4e7d6a79f6369f6cb5b721985aa62f (diff) | |
Merge branch 'for-rmk-devel' of git://git.pengutronix.de/git/imx/linux-2.6 into devel
Conflicts:
arch/arm/Kconfig
arch/arm/Makefile
Diffstat (limited to 'arch/arm/mach-mx3/Makefile')
| -rw-r--r-- | arch/arm/mach-mx3/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-mx3/Makefile b/arch/arm/mach-mx3/Makefile index 272c8a953b30..cd6547b61b1e 100644 --- a/arch/arm/mach-mx3/Makefile +++ b/arch/arm/mach-mx3/Makefile | |||
| @@ -14,3 +14,4 @@ obj-$(CONFIG_MACH_MX31_3DS) += mx31pdk.o | |||
| 14 | obj-$(CONFIG_MACH_MX31MOBOARD) += mx31moboard.o mx31moboard-devboard.o \ | 14 | obj-$(CONFIG_MACH_MX31MOBOARD) += mx31moboard.o mx31moboard-devboard.o \ |
| 15 | mx31moboard-marxbot.o | 15 | mx31moboard-marxbot.o |
| 16 | obj-$(CONFIG_MACH_QONG) += qong.o | 16 | obj-$(CONFIG_MACH_QONG) += qong.o |
| 17 | obj-$(CONFIG_MACH_PCM043) += pcm043.o | ||