diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2006-06-20 19:49:07 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-06-20 19:49:07 +0100 |
commit | 3a8182bd886ab4197c9021645fac7a6f2bdc47ec (patch) | |
tree | 1fdea3919dc2b4bfe2c1e61b81f7e06d6b2f4168 /arch/arm/mach-pxa/Makefile | |
parent | 695a9d236a6fd5a60557a02eff612880c37fe731 (diff) | |
parent | faed568413e89f87cd60aa8b292cc4b9996bae42 (diff) | |
download | lwn-3a8182bd886ab4197c9021645fac7a6f2bdc47ec.tar.gz lwn-3a8182bd886ab4197c9021645fac7a6f2bdc47ec.zip |
Merge Zaurus branch
Diffstat (limited to 'arch/arm/mach-pxa/Makefile')
-rw-r--r-- | arch/arm/mach-pxa/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/Makefile b/arch/arm/mach-pxa/Makefile index 4e8a983e2b83..1610690be419 100644 --- a/arch/arm/mach-pxa/Makefile +++ b/arch/arm/mach-pxa/Makefile @@ -15,7 +15,7 @@ obj-$(CONFIG_ARCH_PXA_IDP) += idp.o obj-$(CONFIG_PXA_SHARP_C7xx) += corgi.o corgi_ssp.o corgi_lcd.o sharpsl_pm.o corgi_pm.o obj-$(CONFIG_PXA_SHARP_Cxx00) += spitz.o corgi_ssp.o corgi_lcd.o sharpsl_pm.o spitz_pm.o obj-$(CONFIG_MACH_AKITA) += akita-ioexp.o -obj-$(CONFIG_MACH_POODLE) += poodle.o +obj-$(CONFIG_MACH_POODLE) += poodle.o corgi_ssp.o obj-$(CONFIG_MACH_TOSA) += tosa.o # Support for blinky lights |