The following commit has been merged in the linux branch: commit 4918a01393a38db4346ae88f38c1fd8324bb5e63 Author: Dmitry Artamonow mad_soft@inbox.ru Date: Wed Oct 7 10:48:26 2009 +0100
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
diff --git a/arch/arm/mach-sa1100/Makefile b/arch/arm/mach-sa1100/Makefile index 8a5546e..bb7b819 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