diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-22 14:33:50 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-22 14:33:50 -0400 |
| commit | bcbfe664e7af019e698cef2feb85ac2b4f1ac11d (patch) | |
| tree | bade11b3088e3768612ecb2cd6e285ab67a23286 /arch/arm/mach-pxa/Makefile | |
| parent | f6335c43f3d7816ba2e69abce4f29c41f65bb27e (diff) | |
| parent | 175854be81dc42b70591760c193113e4898b3e6f (diff) | |
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel
Diffstat (limited to 'arch/arm/mach-pxa/Makefile')
| -rw-r--r-- | arch/arm/mach-pxa/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/Makefile b/arch/arm/mach-pxa/Makefile index d31c9979cfa3..d64c68b232e3 100644 --- a/arch/arm/mach-pxa/Makefile +++ b/arch/arm/mach-pxa/Makefile | |||
| @@ -37,6 +37,7 @@ obj-$(CONFIG_MACH_TRIZEPS4) += trizeps4.o | |||
| 37 | obj-$(CONFIG_MACH_COLIBRI) += colibri.o | 37 | obj-$(CONFIG_MACH_COLIBRI) += colibri.o |
| 38 | obj-$(CONFIG_PXA_SHARP_C7xx) += corgi.o sharpsl_pm.o corgi_pm.o | 38 | obj-$(CONFIG_PXA_SHARP_C7xx) += corgi.o sharpsl_pm.o corgi_pm.o |
| 39 | obj-$(CONFIG_PXA_SHARP_Cxx00) += spitz.o sharpsl_pm.o spitz_pm.o | 39 | obj-$(CONFIG_PXA_SHARP_Cxx00) += spitz.o sharpsl_pm.o spitz_pm.o |
| 40 | obj-$(CONFIG_CORGI_SSP_DEPRECATED) += corgi_ssp.o corgi_lcd.o | ||
| 40 | obj-$(CONFIG_MACH_POODLE) += poodle.o | 41 | obj-$(CONFIG_MACH_POODLE) += poodle.o |
| 41 | obj-$(CONFIG_MACH_PCM027) += pcm027.o | 42 | obj-$(CONFIG_MACH_PCM027) += pcm027.o |
| 42 | obj-$(CONFIG_MACH_PCM990_BASEBOARD) += pcm990-baseboard.o | 43 | obj-$(CONFIG_MACH_PCM990_BASEBOARD) += pcm990-baseboard.o |