diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-13 17:35:09 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-13 17:35:09 +0100 |
| commit | bc7ecbcbc2c0ff235382077b55de7896775afc16 (patch) | |
| tree | 9918b2f3fdeebd9c99a308af94d86bc13c80d0c8 /arch/arm/mach-sa1100/Makefile | |
| parent | ARM: RealView: Fix typo in the RealView/PBX Kconfig entry (diff) | |
| parent | [ARM] pxa/zeus: default configuration for Arcom Zeus SBC. (diff) | |
| download | linux-bc7ecbcbc2c0ff235382077b55de7896775afc16.tar.xz linux-bc7ecbcbc2c0ff235382077b55de7896775afc16.zip | |
Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel
Diffstat (limited to 'arch/arm/mach-sa1100/Makefile')
| -rw-r--r-- | arch/arm/mach-sa1100/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-sa1100/Makefile b/arch/arm/mach-sa1100/Makefile index bb7b8198d0c4..89349c1dd7a6 100644 --- a/arch/arm/mach-sa1100/Makefile +++ b/arch/arm/mach-sa1100/Makefile @@ -25,8 +25,8 @@ led-$(CONFIG_SA1100_CERF) += leds-cerf.o obj-$(CONFIG_SA1100_COLLIE) += collie.o -obj-$(CONFIG_SA1100_H3100) += h3600.o -obj-$(CONFIG_SA1100_H3600) += h3600.o +obj-$(CONFIG_SA1100_H3100) += h3100.o h3xxx.o +obj-$(CONFIG_SA1100_H3600) += h3600.o h3xxx.o obj-$(CONFIG_SA1100_HACKKIT) += hackkit.o led-$(CONFIG_SA1100_HACKKIT) += leds-hackkit.o |