diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-15 02:36:54 +0200 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-15 02:36:54 +0200 |
| commit | 7dafd239ab522d38979ebe44d79aa68ad7b1a383 (patch) | |
| tree | 04754a0c6495e57c1fe5f417fbfc99272d353c0e /arch/h8300/include/asm/atomic.h | |
| parent | Merge commit 'origin/master' into next (diff) | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/sam/kb... (diff) | |
| download | linux-7dafd239ab522d38979ebe44d79aa68ad7b1a383.tar.xz linux-7dafd239ab522d38979ebe44d79aa68ad7b1a383.zip | |
Merge commit 'origin/master' into next
Diffstat (limited to 'arch/h8300/include/asm/atomic.h')
| -rw-r--r-- | arch/h8300/include/asm/atomic.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/h8300/include/asm/atomic.h b/arch/h8300/include/asm/atomic.h index 833186c8dc3b..33c8c0fa9583 100644 --- a/arch/h8300/include/asm/atomic.h +++ b/arch/h8300/include/asm/atomic.h @@ -141,5 +141,5 @@ static __inline__ void atomic_set_mask(unsigned long mask, unsigned long *v) #define smp_mb__before_atomic_inc() barrier() #define smp_mb__after_atomic_inc() barrier() -#include <asm-generic/atomic.h> +#include <asm-generic/atomic-long.h> #endif /* __ARCH_H8300_ATOMIC __ */ |