summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-16 16:51:11 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-16 16:51:11 -0700
commitf563d53c30f3e60cde3a194cc1a87284ee0b3366 (patch)
treec8696dc933093d54b2c36c85364761fafd85d3a0 /arch
parentce4b61f5e2fab568f90adf79642cbfc49aac5bba (diff)
parent7eebb9348655b55553d65fc7cb6cfad292d28dbb (diff)
downloadlinux-stable-f563d53c30f3e60cde3a194cc1a87284ee0b3366.tar.gz
linux-stable-f563d53c30f3e60cde3a194cc1a87284ee0b3366.tar.bz2
linux-stable-f563d53c30f3e60cde3a194cc1a87284ee0b3366.zip
Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/sam/kbuild
* ssh://master.kernel.org/pub/scm/linux/kernel/git/sam/kbuild: x86: fix boot error introduced by kbuild
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/boot/Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile
index d6ed8e5e1ccc..e8756e5f6b29 100644
--- a/arch/x86/boot/Makefile
+++ b/arch/x86/boot/Makefile
@@ -64,10 +64,10 @@ KBUILD_CFLAGS := $(LINUXINCLUDE) -g -Os -D_SETUP -D__KERNEL__ \
KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
$(obj)/zImage: IMAGE_OFFSET := 0x1000
-$(obj)/zImage: EXTRA_AFLAGS := $(SVGA_MODE) $(RAMDISK)
+$(obj)/zImage: asflags-y := $(SVGA_MODE) $(RAMDISK)
$(obj)/bzImage: IMAGE_OFFSET := 0x100000
-$(obj)/bzImage: EXTRA_CFLAGS := -D__BIG_KERNEL__
-$(obj)/bzImage: EXTRA_AFLAGS := $(SVGA_MODE) $(RAMDISK) -D__BIG_KERNEL__
+$(obj)/bzImage: ccflags-y := -D__BIG_KERNEL__
+$(obj)/bzImage: asflags-y := $(SVGA_MODE) $(RAMDISK) -D__BIG_KERNEL__
$(obj)/bzImage: BUILDFLAGS := -b
quiet_cmd_image = BUILD $@