git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
arch
/
sparc64
/
solaris
/
socksys.c
diff --git
a/arch/sparc64/solaris/socksys.c
b/arch/sparc64/solaris/socksys.c
index
fc6669e
..
bc3df95
100644
(file)
--- a/
arch/sparc64/solaris/socksys.c
+++ b/
arch/sparc64/solaris/socksys.c
@@
-26,7
+26,6
@@
#include <linux/slab.h>
#include <linux/syscalls.h>
#include <linux/in.h>
#include <linux/slab.h>
#include <linux/syscalls.h>
#include <linux/in.h>
-#include <linux/devfs_fs_kernel.h>
#include <net/sock.h>
#include <net/sock.h>
@@
-190,8
+189,6
@@
init_socksys(void)
return ret;
}
return ret;
}
- devfs_mk_cdev(MKDEV(30, 0), S_IFCHR|S_IRUSR|S_IWUSR, "socksys");
-
file = fcheck(ret);
/* N.B. Is this valid? Suppose the f_ops are in a module ... */
socksys_file_ops = *file->f_op;
file = fcheck(ret);
/* N.B. Is this valid? Suppose the f_ops are in a module ... */
socksys_file_ops = *file->f_op;
@@
-207,5
+204,4
@@
cleanup_socksys(void)
{
if (unregister_chrdev(30, "socksys"))
printk ("Couldn't unregister socksys character device\n");
{
if (unregister_chrdev(30, "socksys"))
printk ("Couldn't unregister socksys character device\n");
- devfs_remove ("socksys");
}
}