commit 9c3fca2ee6a4a89a64ac72b8159ae5c2be6bb38f
author Eric Miao <eric.y.miao@gmail.com> Wed Jun 23 09:27:32 2010 +0800
committer Eric Miao <eric.y.miao@gmail.com> Thu Aug 05 14:32:23 2010 +0800
tree 7c8c0f9ea78df71af1b9e2ddb86f2aa52c798053
parent 867fc1c718c5c185282cae26d4122a51fbb20f0e

[ARM] pxa: PXA_SHARPSL_DETECT_MACH_ID to include head-sharpsl.S

With kexec-based kernel boot loader on Zaurus, the machine ID is
actually correctly passed, and head-sharpsl.S is not necessary.
Introduce PXA_SHARPSL_DETECT_MACH_ID, and include head-sharpsl.S
only when that's explicitly enabled.

Signed-off-by: Eric Miao <eric.y.miao@gmail.com>

arch/arm/boot/compressed/Makefile

diff --git a/arch/arm/boot/compressed/Makefile b/arch/arm/boot/compressed/Makefile
index 53faa90..2ea1bfa 100644
--- a/arch/arm/boot/compressed/Makefile
+++ b/arch/arm/boot/compressed/Makefile
@@ -36,7 +36,7 @@
 OBJS		+= head-xscale.o
 endif
 
-ifeq ($(CONFIG_PXA_SHARPSL),y)
+ifeq ($(CONFIG_PXA_SHARPSL_DETECT_MACH_ID),y)
 OBJS		+= head-sharpsl.o
 endif