git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' into upstream
[pandora-kernel.git]
/
arch
/
parisc
/
kernel
/
sys_parisc32.c
diff --git
a/arch/parisc/kernel/sys_parisc32.c
b/arch/parisc/kernel/sys_parisc32.c
index
9779ece
..
88a0ad1
100644
(file)
--- a/
arch/parisc/kernel/sys_parisc32.c
+++ b/
arch/parisc/kernel/sys_parisc32.c
@@
-20,7
+20,6
@@
#include <linux/times.h>
#include <linux/time.h>
#include <linux/smp.h>
-#include <linux/smp_lock.h>
#include <linux/sem.h>
#include <linux/msg.h>
#include <linux/shm.h>