diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2007-02-12 23:57:21 -0600 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2007-02-12 23:57:21 -0600 |
| commit | 54c66f6d781e03dc0b23956234963c4911e6d1c0 (patch) | |
| tree | 40619a66ae6d8703a57bf681d087ffeabbffd346 /include/asm-m32r/system.h | |
| parent | 8ce0a7df6e6117d8814e976d4b7ce6a6b2c9cf93 (diff) | |
| parent | 17e0e27020d028a790d97699aff85a43af5be472 (diff) | |
Merge branch 'master' into 85xx
Diffstat (limited to 'include/asm-m32r/system.h')
| -rw-r--r-- | include/asm-m32r/system.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-m32r/system.h b/include/asm-m32r/system.h index 4ce0619f698..99ee09889ff 100644 --- a/include/asm-m32r/system.h +++ b/include/asm-m32r/system.h @@ -339,4 +339,4 @@ __cmpxchg(volatile void *ptr, unsigned long old, unsigned long new, int size) #define arch_align_stack(x) (x) -#endif /* _ASM_M32R_SYSTEM_H */ +#endif /* _ASM_M32R_SYSTEM_H */ |