diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-20 23:17:52 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-20 23:17:52 -0400 |
commit | 093faa1dd26fc6766f8f04c429030757a8a0def4 (patch) | |
tree | eeee443b1bed650293f51a49b908f689c1dbb997 /arch/ppc/boot/Makefile | |
parent | 6ce59b460201c2281c2b6b3ead0b67ab21726268 (diff) | |
parent | 437374e9a95062fe310b901e48585691edaf5dd0 (diff) |
Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/sam/kbuild
* ssh://master.kernel.org/pub/scm/linux/kernel/git/sam/kbuild:
kbuild: restore arch/{ppc/xtensa}/boot cflags
kconfig: set title bar in xconfig
kbuild: fix toplevel Makefile/depmod
Diffstat (limited to 'arch/ppc/boot/Makefile')
-rw-r--r-- | arch/ppc/boot/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/ppc/boot/Makefile b/arch/ppc/boot/Makefile index 487dc66dcc74..500497e3c72d 100644 --- a/arch/ppc/boot/Makefile +++ b/arch/ppc/boot/Makefile | |||
@@ -13,6 +13,8 @@ | |||
13 | # modified by Cort (cort@cs.nmt.edu) | 13 | # modified by Cort (cort@cs.nmt.edu) |
14 | # | 14 | # |
15 | 15 | ||
16 | # KBUILD_CFLAGS used when building rest of boot (takes effect recursively) | ||
17 | KBUILD_CFLAGS += -fno-builtin -D__BOOTER__ -Iarch/$(ARCH)/boot/include | ||
16 | HOSTCFLAGS += -Iarch/$(ARCH)/boot/include | 18 | HOSTCFLAGS += -Iarch/$(ARCH)/boot/include |
17 | 19 | ||
18 | BOOT_TARGETS = zImage zImage.initrd znetboot znetboot.initrd | 20 | BOOT_TARGETS = zImage zImage.initrd znetboot znetboot.initrd |