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 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
[cascardo/linux.git]
/
arch
/
sparc64
/
solaris
/
socksys.c
diff --git
a/arch/sparc64/solaris/socksys.c
b/arch/sparc64/solaris/socksys.c
index
89a4757
..
7736411
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>
@@
-163,7
+162,7
@@
static unsigned int socksys_poll(struct file * filp, poll_table * wait)
return mask;
}
return mask;
}
-static struct file_operations socksys_fops = {
+static
const
struct file_operations socksys_fops = {
.open = socksys_open,
.release = socksys_release,
};
.open = socksys_open,
.release = socksys_release,
};
@@
-200,6
+199,5
@@
int __init init_socksys(void)
void __exit cleanup_socksys(void)
{
void __exit cleanup_socksys(void)
{
- if (unregister_chrdev(30, "socksys"))
- printk ("Couldn't unregister socksys character device\n");
+ unregister_chrdev(30, "socksys");
}
}