summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-10-14 16:59:11 +1200
committerLinus Torvalds <torvalds@linux-foundation.org>2011-10-14 16:59:11 +1200
commit95bc156c62a57cda1b225e03ae23eb2764ee1046 (patch)
tree8307f64b3727db3ca51c71d8f0a03e6b024721be /arch
parent2ad53110d654c7c9a80dcea341f4117246c1b6f9 (diff)
parentd52104b29a3735f2b4dceefcb01b19d370a783ea (diff)
downloadlinux-95bc156c62a57cda1b225e03ae23eb2764ee1046.tar.gz
linux-95bc156c62a57cda1b225e03ae23eb2764ee1046.tar.bz2
linux-95bc156c62a57cda1b225e03ae23eb2764ee1046.zip
Merge branch 'stable' of git://github.com/cmetcalf-tilera/linux-tile
* 'stable' of git://github.com/cmetcalf-tilera/linux-tile: tile: revert change from <asm/atomic.h> to <linux/atomic.h> in asm files
Diffstat (limited to 'arch')
-rw-r--r--arch/tile/kernel/intvec_32.S2
-rw-r--r--arch/tile/lib/atomic_asm_32.S2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/tile/kernel/intvec_32.S b/arch/tile/kernel/intvec_32.S
index fc94607f0bd5..aecc8ed5f39b 100644
--- a/arch/tile/kernel/intvec_32.S
+++ b/arch/tile/kernel/intvec_32.S
@@ -21,7 +21,7 @@
#include <asm/ptrace.h>
#include <asm/thread_info.h>
#include <asm/irqflags.h>
-#include <linux/atomic.h>
+#include <asm/atomic_32.h>
#include <asm/asm-offsets.h>
#include <hv/hypervisor.h>
#include <arch/abi.h>
diff --git a/arch/tile/lib/atomic_asm_32.S b/arch/tile/lib/atomic_asm_32.S
index 1f75a2a56101..30638042691d 100644
--- a/arch/tile/lib/atomic_asm_32.S
+++ b/arch/tile/lib/atomic_asm_32.S
@@ -70,7 +70,7 @@
*/
#include <linux/linkage.h>
-#include <linux/atomic.h>
+#include <asm/atomic_32.h>
#include <asm/page.h>
#include <asm/processor.h>