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-powerpc/atomic.h | |
| parent | e91c021c487110386a07facd0396e6c3b7cf9c1f (diff) | |
| parent | d99cf9d679a520d67f81d805b7cb91c68e1847f0 (diff) | |
Merge ../torvalds-2.6/
Diffstat (limited to 'include/asm-powerpc/atomic.h')
| -rw-r--r-- | include/asm-powerpc/atomic.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-powerpc/atomic.h b/include/asm-powerpc/atomic.h index ec4b14468959..ae395a0632a6 100644 --- a/include/asm-powerpc/atomic.h +++ b/include/asm-powerpc/atomic.h | |||
| @@ -402,5 +402,6 @@ static __inline__ long atomic64_dec_if_positive(atomic64_t *v) | |||
| 402 | 402 | ||
| 403 | #endif /* __powerpc64__ */ | 403 | #endif /* __powerpc64__ */ |
| 404 | 404 | ||
| 405 | #include <asm-generic/atomic.h> | ||
| 405 | #endif /* __KERNEL__ */ | 406 | #endif /* __KERNEL__ */ |
| 406 | #endif /* _ASM_POWERPC_ATOMIC_H_ */ | 407 | #endif /* _ASM_POWERPC_ATOMIC_H_ */ |