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 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
[pandora-kernel.git]
/
arch
/
cris
/
kernel
/
sys_cris.c
diff --git
a/arch/cris/kernel/sys_cris.c
b/arch/cris/kernel/sys_cris.c
index
a79fbd8
..
2ad962c
100644
(file)
--- a/
arch/cris/kernel/sys_cris.c
+++ b/
arch/cris/kernel/sys_cris.c
@@
-15,7
+15,6
@@
#include <linux/mm.h>
#include <linux/fs.h>
#include <linux/smp.h>
-#include <linux/smp_lock.h>
#include <linux/sem.h>
#include <linux/msg.h>
#include <linux/shm.h>