diff options
author | Tony Lindgren <tony@atomide.com> | 2010-08-02 13:23:38 +0200 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2010-08-02 13:23:38 +0200 |
commit | 055a1b8c9927bc587f293020a54c6cd8e24dfac0 (patch) | |
tree | db7c8d00931180c4896c9e00d2cb506939592cda /arch/powerpc/Makefile | |
parent | omap: mux: fix multipath gpio handling (diff) | |
parent | omap: Devkit8000: Use DIE id to initialize dm9000 MAC address (diff) | |
download | linux-055a1b8c9927bc587f293020a54c6cd8e24dfac0.tar.xz linux-055a1b8c9927bc587f293020a54c6cd8e24dfac0.zip |
Merge branch 'devel-misc' into omap-for-linus
Diffstat (limited to 'arch/powerpc/Makefile')
-rw-r--r-- | arch/powerpc/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile index 42dcd3f4ad7b..77cfe7a29e25 100644 --- a/arch/powerpc/Makefile +++ b/arch/powerpc/Makefile @@ -92,10 +92,10 @@ endif else KBUILD_CFLAGS += $(call cc-option,-mtune=power4) endif -else -LDFLAGS_MODULE += arch/powerpc/lib/crtsavres.o endif +LDFLAGS_MODULE += arch/powerpc/lib/crtsavres.o + ifeq ($(CONFIG_TUNE_CELL),y) KBUILD_CFLAGS += $(call cc-option,-mtune=cell) endif |