aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-sa1100/Makefile
diff options
context:
space:
mode:
authorDmitry Artamonow <mad_soft@inbox.ru>2009-10-07 10:48:26 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-10-07 13:13:01 +0100
commit4918a01393a38db4346ae88f38c1fd8324bb5e63 (patch)
tree2ccf79721671fed143b308c351cf08054d17cb68 /arch/arm/mach-sa1100/Makefile
parentb623438341b40ee78bdab7ab509889de519af2e7 (diff)
downloadlinux-2.6.34-ux500-4918a01393a38db4346ae88f38c1fd8324bb5e63.tar.gz
ARM: 5752/1: SA1100: fix building of h3100
Both iPaqs h3100 and h3600 currently share the same source file - h3600.c But Makefile builds it only if CONFIG_SA1100_H3600 selected, so selecting just CONFIG_SA1100_H3100 results in "no machine record defined" message and aborted compilation. Fix it. Signed-off-by: Dmitry Artamonow <mad_soft@inbox.ru> Acked-by: Kristoffer Ericson <kristoffer.ericson@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-sa1100/Makefile')
-rw-r--r--arch/arm/mach-sa1100/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-sa1100/Makefile b/arch/arm/mach-sa1100/Makefile
index 8a5546e6d54..bb7b8198d0c 100644
--- a/arch/arm/mach-sa1100/Makefile
+++ b/arch/arm/mach-sa1100/Makefile
@@ -25,6 +25,7 @@ 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_HACKKIT) += hackkit.o