diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-05-18 17:55:24 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-05-18 17:55:24 +1000 |
| commit | a42bc5ef61cd6a1e7b9ef9a04a16bae628e23d6c (patch) | |
| tree | e41ef340022a85abeefa9cba070c30acda5e0b06 /arch/frv/include/asm/atomic.h | |
| parent | fe8b44a9ede7df70b886e53d3ca609eaa675aaf1 (diff) | |
| parent | 52f9ce5dd9c55445b658cde1d3883afa871b4828 (diff) | |
Merge commit 'asm-generic/next'
Diffstat (limited to 'arch/frv/include/asm/atomic.h')
| -rw-r--r-- | arch/frv/include/asm/atomic.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/frv/include/asm/atomic.h b/arch/frv/include/asm/atomic.h index 296c35cfb207..0409d981fd39 100644 --- a/arch/frv/include/asm/atomic.h +++ b/arch/frv/include/asm/atomic.h @@ -194,5 +194,5 @@ static __inline__ int atomic_add_unless(atomic_t *v, int a, int u) #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0) -#include <asm-generic/atomic.h> +#include <asm-generic/atomic-long.h> #endif /* _ASM_ATOMIC_H */ |