diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-08-08 09:41:23 +0200 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-08-08 09:41:23 +0200 |
| commit | 4791d63bd40ec63c533060707dae0232b9969dc0 (patch) | |
| tree | 8e10fe91cea556c10f7d211b65c5f6bdd7ffeb55 /arch/sparc/kernel/smp_64.c | |
| parent | mmc: sdhi, mmcif: zboot: Correct clock disable logic (diff) | |
| parent | Linux 3.1-rc1 (diff) | |
| download | linux-4791d63bd40ec63c533060707dae0232b9969dc0.tar.xz linux-4791d63bd40ec63c533060707dae0232b9969dc0.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into rmobile-latest
Diffstat (limited to 'arch/sparc/kernel/smp_64.c')
| -rw-r--r-- | arch/sparc/kernel/smp_64.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/kernel/smp_64.c b/arch/sparc/kernel/smp_64.c index 99cb17251bb5..4a442c32e117 100644 --- a/arch/sparc/kernel/smp_64.c +++ b/arch/sparc/kernel/smp_64.c @@ -28,7 +28,7 @@ #include <asm/head.h> #include <asm/ptrace.h> -#include <asm/atomic.h> +#include <linux/atomic.h> #include <asm/tlbflush.h> #include <asm/mmu_context.h> #include <asm/cpudata.h> |