git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'oprofile-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
arch
/
arm
/
include
/
asm
/
atomic.h
diff --git
a/arch/arm/include/asm/atomic.h
b/arch/arm/include/asm/atomic.h
index
9e07fe5
..
9ed2377
100644
(file)
--- 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)
#else /* ARM_ARCH_6 */
-#include <asm/system.h>
-
#ifdef CONFIG_SMP
#error SMP not supported on pre-ARMv6 CPUs
#endif