projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
[powerpc.git]
/
arch
/
sparc64
/
solaris
/
socksys.c
diff --git
a/arch/sparc64/solaris/socksys.c
b/arch/sparc64/solaris/socksys.c
index
c286444
..
e94f6e5
100644
(file)
--- a/
arch/sparc64/solaris/socksys.c
+++ b/
arch/sparc64/solaris/socksys.c
@@
-17,7
+17,6
@@
#include <linux/kernel.h>
#include <linux/sched.h>
#include <linux/smp.h>
#include <linux/kernel.h>
#include <linux/sched.h>
#include <linux/smp.h>
-#include <linux/smp_lock.h>
#include <linux/ioctl.h>
#include <linux/fs.h>
#include <linux/file.h>
#include <linux/ioctl.h>
#include <linux/fs.h>
#include <linux/file.h>