diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org>
| 2011-10-14 16:59:11 +1200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org>
| 2011-10-14 16:59:11 +1200 |
| commit | 95bc156c62a57cda1b225e03ae23eb2764ee1046 (patch) | |
| tree | 8307f64b3727db3ca51c71d8f0a03e6b024721be /arch/tile/lib/atomic_asm_32.S | |
| parent | Merge branch 'x86-urgent-for-linus' of git://tesla.tglx.de/git/linux-2.6-tip (diff) | |
| parent | tile: revert change from <asm/atomic.h> to <linux/atomic.h> in asm files (diff) | |
| download | linux-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/tile/lib/atomic_asm_32.S')
| -rw-r--r-- | arch/tile/lib/atomic_asm_32.S | 2 |
1 files changed, 1 insertions, 1 deletions
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> |