diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-05-12 05:57:09 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-05-12 05:57:09 -0400 |
| commit | ddc4097b77bbb227851a44287acb2fb8a9896cc1 (patch) | |
| tree | 319d098879bed7c45543d983de8becd509701b22 /arch/m32r/include/asm | |
| parent | bec4c99e8637b5b8bd4b0513eacb51da25885e3b (diff) | |
| parent | ae31c1fbdbb18d917b0a1139497c2dbd35886989 (diff) | |
Merge branch 'topic/drvdata-fix' into topic/asoc
Diffstat (limited to 'arch/m32r/include/asm')
| -rw-r--r-- | arch/m32r/include/asm/assembler.h | 7 |
1 files changed, 4 insertions, 3 deletions
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 @@ | |||
| 9 | * This file contains M32R architecture specific macro definitions. | 9 | * This file contains M32R architecture specific macro definitions. |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/stringify.h> | ||
| 13 | |||
| 14 | #undef __STR | ||
| 12 | 15 | ||
| 13 | #ifndef __STR | ||
| 14 | #ifdef __ASSEMBLY__ | 16 | #ifdef __ASSEMBLY__ |
| 15 | #define __STR(x) x | 17 | #define __STR(x) x |
| 16 | #else | 18 | #else |
| 17 | #define __STR(x) #x | 19 | #define __STR(x) __stringify(x) |
| 18 | #endif | 20 | #endif |
| 19 | #endif /* __STR */ | ||
| 20 | 21 | ||
| 21 | #ifdef CONFIG_SMP | 22 | #ifdef CONFIG_SMP |
| 22 | #define M32R_LOCK __STR(lock) | 23 | #define M32R_LOCK __STR(lock) |