diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-05 17:10:07 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-05 17:10:07 -0400 |
| commit | da9e82b3b8989fc09e2a4c45b9da604ba2b4c46d (patch) | |
| tree | 7355d2afe95be27fddb8fa4baa46476c76aeb8ee /arch/powerpc | |
| parent | 90d3417a3a4e810d67081dd106f0e603a856978f (diff) | |
| parent | 772320e84588dcbe1600ffb83e5f328f2209ac2a (diff) | |
Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6
* 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
modpost: support objects with more than 64k sections
trivial: fix a typo in a filename
frv: clean up arch/frv/Makefile
kbuild: allow assignment to {A,C}FLAGS_KERNEL on the command line
kbuild: allow assignment to {A,C,LD}FLAGS_MODULE on the command line
Kbuild: Add option to set -femit-struct-debug-baseonly
Makefile: "make kernelrelease" should show the correct full kernel version
Makefile.build: make KBUILD_SYMTYPES work again
Diffstat (limited to 'arch/powerpc')
| -rw-r--r-- | arch/powerpc/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile index 77cfe7a29e25..5d42f5eae70f 100644 --- a/arch/powerpc/Makefile +++ b/arch/powerpc/Makefile | |||
| @@ -94,7 +94,7 @@ else | |||
| 94 | endif | 94 | endif |
| 95 | endif | 95 | endif |
| 96 | 96 | ||
| 97 | LDFLAGS_MODULE += arch/powerpc/lib/crtsavres.o | 97 | KBUILD_LDFLAGS_MODULE += arch/powerpc/lib/crtsavres.o |
| 98 | 98 | ||
| 99 | ifeq ($(CONFIG_TUNE_CELL),y) | 99 | ifeq ($(CONFIG_TUNE_CELL),y) |
| 100 | KBUILD_CFLAGS += $(call cc-option,-mtune=cell) | 100 | KBUILD_CFLAGS += $(call cc-option,-mtune=cell) |