diff options
| author | David S. Miller <davem@davemloft.net> | 2008-10-11 21:39:35 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-10-11 21:39:35 +0200 |
| commit | 56c5d900dbb8e042bfad035d18433476931d8f93 (patch) | |
| tree | 00b793965beeef10db03e0ff021d2d965c410759 /include/asm-x86/atomic_32.h | |
| parent | leo: disable cursor when leaving graphics mode (diff) | |
| parent | Merge phase #4 (X2APIC, APIC unification, CPU identification unification) of ... (diff) | |
| download | linux-56c5d900dbb8e042bfad035d18433476931d8f93.tar.xz linux-56c5d900dbb8e042bfad035d18433476931d8f93.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
sound/core/memalloc.c
Diffstat (limited to 'include/asm-x86/atomic_32.h')
| -rw-r--r-- | include/asm-x86/atomic_32.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-x86/atomic_32.h b/include/asm-x86/atomic_32.h index 21a4825148c0..14d3f0beb889 100644 --- a/include/asm-x86/atomic_32.h +++ b/include/asm-x86/atomic_32.h @@ -1,5 +1,5 @@ -#ifndef __ARCH_I386_ATOMIC__ -#define __ARCH_I386_ATOMIC__ +#ifndef ASM_X86__ATOMIC_32_H +#define ASM_X86__ATOMIC_32_H #include <linux/compiler.h> #include <asm/processor.h> @@ -256,4 +256,4 @@ static inline int atomic_add_unless(atomic_t *v, int a, int u) #define smp_mb__after_atomic_inc() barrier() #include <asm-generic/atomic.h> -#endif +#endif /* ASM_X86__ATOMIC_32_H */ |