diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-03 01:28:58 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-03 01:28:58 +0200 |
| commit | 912e7796b06fa9b1006835605e27c42e46801b8f (patch) | |
| tree | 2c35b2ce8ea83f936ac6ff811e50e726ce1f9308 | |
| parent | ibft: fix the display of a few fields in the NIC attribute structure in sysfs (diff) | |
| parent | m32r: use __stringify() macro in assembler.h (diff) | |
| download | linux-912e7796b06fa9b1006835605e27c42e46801b8f.tar.xz linux-912e7796b06fa9b1006835605e27c42e46801b8f.zip | |
Merge branch 'for-linus' of git://www.linux-m32r.org/git/takata/linux-2.6_dev
* 'for-linus' of git://www.linux-m32r.org/git/takata/linux-2.6_dev:
m32r: use __stringify() macro in assembler.h
m32r: build fix for __stringify macro
| -rw-r--r-- | arch/m32r/boot/compressed/Makefile | 1 | ||||
| -rw-r--r-- | arch/m32r/include/asm/assembler.h | 7 | ||||
| -rw-r--r-- | arch/m32r/kernel/Makefile | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/arch/m32r/boot/compressed/Makefile b/arch/m32r/boot/compressed/Makefile index d908e1d3c07f..560484ae35ec 100644 --- a/arch/m32r/boot/compressed/Makefile +++ b/arch/m32r/boot/compressed/Makefile @@ -6,7 +6,6 @@ targets := vmlinux vmlinux.bin vmlinux.bin.gz head.o misc.o \ piggy.o vmlinux.lds -EXTRA_AFLAGS := -traditional OBJECTS = $(obj)/head.o $(obj)/misc.o diff --git a/arch/m32r/include/asm/assembler.h b/arch/m32r/include/asm/assembler.h index 26351539b5ff..728799fc70aa 100644 --- a/arch/m32r/include/asm/assembler.h +++ b/arch/m32r/include/asm/assembler.h @@ -9,14 +9,15 @@ * This file contains M32R architecture specific macro definitions. */ +#include <linux/stringify.h> + +#undef __STR -#ifndef __STR #ifdef __ASSEMBLY__ #define __STR(x) x #else -#define __STR(x) #x +#define __STR(x) __stringify(x) #endif -#endif /* __STR */ #ifdef CONFIG_SMP #define M32R_LOCK __STR(lock) diff --git a/arch/m32r/kernel/Makefile b/arch/m32r/kernel/Makefile index 09200d4886e3..b1a4b6036591 100644 --- a/arch/m32r/kernel/Makefile +++ b/arch/m32r/kernel/Makefile @@ -9,5 +9,3 @@ obj-y := process.o entry.o traps.o align.o irq.o setup.o time.o \ obj-$(CONFIG_SMP) += smp.o smpboot.o obj-$(CONFIG_MODULES) += module.o - -EXTRA_AFLAGS := -traditional |