diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-04-12 19:49:28 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-04-12 19:49:28 +0200 |
| commit | 8065248069097dddf9945acfb2081025e9618c16 (patch) | |
| tree | eddf3fb0372ba0f65c01382d386942ea8d18932d /arch/avr32/include/asm/atomic.h | |
| parent | rt2x00: do not generate seqno in h/w if QOS is disabled (diff) | |
| parent | NFC: Fix the LLCP Tx fragmentation loop (diff) | |
| download | linux-8065248069097dddf9945acfb2081025e9618c16.tar.xz linux-8065248069097dddf9945acfb2081025e9618c16.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'arch/avr32/include/asm/atomic.h')
| -rw-r--r-- | arch/avr32/include/asm/atomic.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/avr32/include/asm/atomic.h b/arch/avr32/include/asm/atomic.h index e0ac2631c87e..61407279208a 100644 --- a/arch/avr32/include/asm/atomic.h +++ b/arch/avr32/include/asm/atomic.h @@ -15,7 +15,7 @@ #define __ASM_AVR32_ATOMIC_H #include <linux/types.h> -#include <asm/system.h> +#include <asm/cmpxchg.h> #define ATOMIC_INIT(i) { (i) } |