diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-11-26 15:04:42 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-11-26 15:04:47 +0100 |
| commit | e4e91ac410356da3a518188f371e9d3b52ee38ee (patch) | |
| tree | e1b33743a08847030285d34bcb2eb8ba90f30a0c /arch/sparc/kernel/sys_sparc32.c | |
| parent | perf bench: Add feature that measures the performance of the arch/x86/lib/mem... (diff) | |
| parent | Linux 2.6.37-rc3 (diff) | |
| download | linux-e4e91ac410356da3a518188f371e9d3b52ee38ee.tar.xz linux-e4e91ac410356da3a518188f371e9d3b52ee38ee.zip | |
Merge commit 'v2.6.37-rc3' into perf/core
Merge reason: Pick up latest fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/sparc/kernel/sys_sparc32.c')
| -rw-r--r-- | arch/sparc/kernel/sys_sparc32.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/sparc/kernel/sys_sparc32.c b/arch/sparc/kernel/sys_sparc32.c index e6375a750d9a..6db18c6927fb 100644 --- a/arch/sparc/kernel/sys_sparc32.c +++ b/arch/sparc/kernel/sys_sparc32.c @@ -17,7 +17,6 @@ #include <linux/resource.h> #include <linux/times.h> #include <linux/smp.h> -#include <linux/smp_lock.h> #include <linux/sem.h> #include <linux/msg.h> #include <linux/shm.h> |