diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-01-06 15:59:59 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-01-06 15:59:59 -0500 |
| commit | ccf18968b1bbc2fb117190a1984ac2a826dac228 (patch) | |
| tree | 7bc8fbf5722aecf1e84fa50c31c657864cba1daa /include/asm-sh64 | |
| parent | e91c021c487110386a07facd0396e6c3b7cf9c1f (diff) | |
| parent | d99cf9d679a520d67f81d805b7cb91c68e1847f0 (diff) | |
Merge ../torvalds-2.6/
Diffstat (limited to 'include/asm-sh64')
| -rw-r--r-- | include/asm-sh64/atomic.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-sh64/atomic.h b/include/asm-sh64/atomic.h index 927a2bc27b30..f3ce5c0df13a 100644 --- a/include/asm-sh64/atomic.h +++ b/include/asm-sh64/atomic.h | |||
| @@ -152,4 +152,5 @@ static __inline__ void atomic_set_mask(unsigned int mask, atomic_t *v) | |||
| 152 | #define smp_mb__before_atomic_inc() barrier() | 152 | #define smp_mb__before_atomic_inc() barrier() |
| 153 | #define smp_mb__after_atomic_inc() barrier() | 153 | #define smp_mb__after_atomic_inc() barrier() |
| 154 | 154 | ||
| 155 | #include <asm-generic/atomic.h> | ||
| 155 | #endif /* __ASM_SH64_ATOMIC_H */ | 156 | #endif /* __ASM_SH64_ATOMIC_H */ |