diff options
| author | Steve French <sfrench@us.ibm.com> | 2006-06-25 11:57:32 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2006-06-25 11:57:32 -0400 |
| commit | bbe5d235ee201705530a7153b57e141cd77d818b (patch) | |
| tree | e98c31b4cb2ced6357a87a02596f9ecdbd6dbb26 /include/asm-arm/atomic.h | |
| parent | 189acaaef81b1d71aedd0d28810de24160c2e781 (diff) | |
| parent | dfd8317d3340f03bc06eba6b58f0ec0861da4a13 (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'include/asm-arm/atomic.h')
| -rw-r--r-- | include/asm-arm/atomic.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-arm/atomic.h b/include/asm-arm/atomic.h index 3d7283d84405..4b0ce3e7de9a 100644 --- a/include/asm-arm/atomic.h +++ b/include/asm-arm/atomic.h | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | #ifndef __ASM_ARM_ATOMIC_H | 11 | #ifndef __ASM_ARM_ATOMIC_H |
| 12 | #define __ASM_ARM_ATOMIC_H | 12 | #define __ASM_ARM_ATOMIC_H |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/compiler.h> | 14 | #include <linux/compiler.h> |
| 16 | 15 | ||
| 17 | typedef struct { volatile int counter; } atomic_t; | 16 | typedef struct { volatile int counter; } atomic_t; |