diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2009-08-10 17:40:50 -0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2009-08-10 17:40:50 -0400 |
| commit | dcbf77cac640af0ab944d5cbb07934bf6708b4d9 (patch) | |
| tree | e2f4d1b3a1089ee10436cb19740a9cb99f2dc527 /arch/arm/include/asm | |
| parent | c00aafcd4977769e8728292302ddbbb8b1082fab (diff) | |
| parent | 85dfd81dc57e8183a277ddd7a56aa65c96f3f487 (diff) | |
Merge branch 'master' into for-linus
Diffstat (limited to 'arch/arm/include/asm')
| -rw-r--r-- | arch/arm/include/asm/atomic.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/include/asm/atomic.h b/arch/arm/include/asm/atomic.h index 9e07fe507029..9ed2377fe8e5 100644 --- a/arch/arm/include/asm/atomic.h +++ b/arch/arm/include/asm/atomic.h | |||
| @@ -159,8 +159,6 @@ static inline void atomic_clear_mask(unsigned long mask, unsigned long *addr) | |||
| 159 | 159 | ||
| 160 | #else /* ARM_ARCH_6 */ | 160 | #else /* ARM_ARCH_6 */ |
| 161 | 161 | ||
| 162 | #include <asm/system.h> | ||
| 163 | |||
| 164 | #ifdef CONFIG_SMP | 162 | #ifdef CONFIG_SMP |
| 165 | #error SMP not supported on pre-ARMv6 CPUs | 163 | #error SMP not supported on pre-ARMv6 CPUs |
| 166 | #endif | 164 | #endif |