diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2011-10-24 17:03:35 +0200 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-10-24 17:03:35 +0200 |
| commit | 2bf6f675fa1a0f80b21aff20e6c21e87d6a7c9c9 (patch) | |
| tree | ef49d741211dcc4f38636b5c422c9c346da09adf /arch/tile/kernel/intvec_32.S | |
| parent | 5762c20593b6b959f1470dc6f1ff4ca4d9570f8d (diff) | |
| parent | c3b92c8787367a8bb53d57d9789b558f1295cc96 (diff) | |
Merge commit 'v3.1' into devicetree/next
Diffstat (limited to 'arch/tile/kernel/intvec_32.S')
| -rw-r--r-- | arch/tile/kernel/intvec_32.S | 2 |
1 files changed, 1 insertions, 1 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> |