projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linus' into x86/step
[cascardo/linux.git]
/
arch
/
ia64
/
kernel
/
sys_ia64.c
diff --git
a/arch/ia64/kernel/sys_ia64.c
b/arch/ia64/kernel/sys_ia64.c
index
2fcaa20
..
1eda194
100644
(file)
--- a/
arch/ia64/kernel/sys_ia64.c
+++ b/
arch/ia64/kernel/sys_ia64.c
@@
-13,7
+13,6
@@
#include <linux/shm.h>
#include <linux/file.h> /* doh, must come after sched.h... */
#include <linux/smp.h>
-#include <linux/smp_lock.h>
#include <linux/syscalls.h>
#include <linux/highuid.h>
#include <linux/hugetlb.h>