diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-11 09:41:02 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-11 09:41:02 -0400 |
| commit | 2514395ef88b46e895726a8d40966cb83de7940c (patch) | |
| tree | 216c6e194e81bdd9c97697cf162cc9505bde310a /arch | |
| parent | b3967dc566bc89df19e9aeb87b2fd483418b02e6 (diff) | |
| parent | b5ac4817de3032796c558b0a32062e7392b5ea60 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild
* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild:
kconfig: fix typo in change count initialization
kconfig: recenter menuconfig
kconfig: revert conf behaviour change
kconfig: fix default value for choice input
kbuild: fix NULL dereference in scripts/mod/modpost.c
kbuild: fix mode of checkstack.pl and other files.
kbuild: rebuild initramfs if content of initramfs changes
kbuild: properly pass options to hostcc when doing make O=..
kbuild: modules_install for external modules must not remove existing modules
kbuild: fix make dir/
ver_linux: don't print reiser4progs version if none found
kbuild: mips: fix sed regexp to generate asm-offset.h
kbuild: fix building single targets with make O=.. single-target
kbuild: use relative path to -I
kbuild: fix unneeded rebuilds in drivers/net/chelsio after moving source tree
kbuild: fix unneeded rebuilds in drivers/media/video after moving source tree
kbuild: fix garbled text in modules.txt
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/ppc/boot/lib/Makefile | 2 | ||||
| -rw-r--r-- | arch/sparc/math-emu/Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/ppc/boot/lib/Makefile b/arch/ppc/boot/lib/Makefile index d4077e69086f..80c84d562fa4 100644 --- a/arch/ppc/boot/lib/Makefile +++ b/arch/ppc/boot/lib/Makefile | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | # | 3 | # |
| 4 | 4 | ||
| 5 | CFLAGS_kbd.o := -Idrivers/char | 5 | CFLAGS_kbd.o := -Idrivers/char |
| 6 | CFLAGS_vreset.o := -I$(srctree)/arch/ppc/boot/include | 6 | CFLAGS_vreset.o := -Iarch/ppc/boot/include |
| 7 | 7 | ||
| 8 | zlib := infblock.c infcodes.c inffast.c inflate.c inftrees.c infutil.c | 8 | zlib := infblock.c infcodes.c inffast.c inflate.c inftrees.c infutil.c |
| 9 | 9 | ||
diff --git a/arch/sparc/math-emu/Makefile b/arch/sparc/math-emu/Makefile index f84a9a6162be..8136987977f4 100644 --- a/arch/sparc/math-emu/Makefile +++ b/arch/sparc/math-emu/Makefile | |||
| @@ -5,4 +5,4 @@ | |||
| 5 | obj-y := math.o | 5 | obj-y := math.o |
| 6 | 6 | ||
| 7 | EXTRA_AFLAGS := -ansi | 7 | EXTRA_AFLAGS := -ansi |
| 8 | EXTRA_CFLAGS = -I. -I$(TOPDIR)/include/math-emu -w | 8 | EXTRA_CFLAGS = -I. -Iinclude/math-emu -w |