git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.infradead.org/mtd-2.6
[pandora-kernel.git]
/
arch
/
arm
/
boot
/
compressed
/
Makefile
diff --git
a/arch/arm/boot/compressed/Makefile
b/arch/arm/boot/compressed/Makefile
index
7636c9b
..
68775e3
100644
(file)
--- a/
arch/arm/boot/compressed/Makefile
+++ b/
arch/arm/boot/compressed/Makefile
@@
-33,7
+33,7
@@
ifeq ($(CONFIG_CPU_XSCALE),y)
OBJS += head-xscale.o
endif
-ifeq ($(CONFIG_PXA_SHARPSL),y)
+ifeq ($(CONFIG_PXA_SHARPSL
_DETECT_MACH_ID
),y)
OBJS += head-sharpsl.o
endif