diff options
Diffstat (limited to 'include/asm-generic')
| -rw-r--r-- | include/asm-generic/atomic-long.h (renamed from include/asm-generic/atomic.h) | 6 | ||||
| -rw-r--r-- | include/asm-generic/bitops/atomic.h | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/include/asm-generic/atomic.h b/include/asm-generic/atomic-long.h index 3673a13b6703..76e27d66c055 100644 --- a/include/asm-generic/atomic.h +++ b/include/asm-generic/atomic-long.h @@ -1,5 +1,5 @@ -#ifndef _ASM_GENERIC_ATOMIC_H -#define _ASM_GENERIC_ATOMIC_H +#ifndef _ASM_GENERIC_ATOMIC_LONG_H +#define _ASM_GENERIC_ATOMIC_LONG_H /* * Copyright (C) 2005 Silicon Graphics, Inc. * Christoph Lameter @@ -255,4 +255,4 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u) #endif /* BITS_PER_LONG == 64 */ -#endif /* _ASM_GENERIC_ATOMIC_H */ +#endif /* _ASM_GENERIC_ATOMIC_LONG_H */ diff --git a/include/asm-generic/bitops/atomic.h b/include/asm-generic/bitops/atomic.h index 4657f3e410fc..c8946465e63a 100644 --- a/include/asm-generic/bitops/atomic.h +++ b/include/asm-generic/bitops/atomic.h @@ -2,6 +2,7 @@ #define _ASM_GENERIC_BITOPS_ATOMIC_H_ #include <asm/types.h> +#include <asm/system.h> #ifdef CONFIG_SMP #include <asm/spinlock.h> |