Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / arch / arm / boot / compressed / Makefile

diff --git a/arch/arm/boot/compressed/Makefile b/arch/arm/boot/compressed/Makefile
index 25b4f55983aacca9c3502e9ba70afd4566275f4a..bc9714780f7a7577c949ee2fc0c91e754435fcc6 100644 (file)
--- a/arch/arm/boot/compressed/Makefile
+++ b/arch/arm/boot/compressed/Makefile
@@ -91,7 +91,7 @@ ifneq ($(PARAMS_PHYS),)
 LDFLAGS_vmlinux += --defsym params_phys=$(PARAMS_PHYS)
 endif
 LDFLAGS_vmlinux += -p --no-undefined -X \
-       $(shell $(CC) $(CFLAGS) --print-libgcc-file-name) -T
+       $(shell $(CC) $(KBUILD_CFLAGS) --print-libgcc-file-name) -T
 
 # Don't allow any static data in misc.o, which
 # would otherwise mess up our GOT table