Merge branch 'master' into upstream

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

diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 2a0b2c8a1fe00df55a7dd87092d4ce3661399cfe..6f4f8bf3607168e4b7df0c213a676ac7d68e8521 100644 (file)
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -174,11 +174,13 @@ libs-y                            := arch/arm/lib/ $(libs-y)
 
 # Default target when executing plain make
 ifeq ($(CONFIG_XIP_KERNEL),y)
-all: xipImage
+KBUILD_IMAGE := xipImage
 else
-all: zImage
+KBUILD_IMAGE := zImage
 endif
 
+all:   $(KBUILD_IMAGE)
+
 boot := arch/arm/boot
 
 #      Update machine arch and proc symlinks if something which affects