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]
/
net
/
bluetooth
/
cmtp
/
sock.c
diff --git
a/net/bluetooth/cmtp/sock.c
b/net/bluetooth/cmtp/sock.c
index
beb045b
..
10ad7fd
100644
(file)
--- a/
net/bluetooth/cmtp/sock.c
+++ b/
net/bluetooth/cmtp/sock.c
@@
-20,10
+20,10
@@
SOFTWARE IS DISCLAIMED.
*/
SOFTWARE IS DISCLAIMED.
*/
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/types.h>
#include <linux/module.h>
#include <linux/types.h>
+#include <linux/capability.h>
#include <linux/errno.h>
#include <linux/kernel.h>
#include <linux/sched.h>
#include <linux/errno.h>
#include <linux/kernel.h>
#include <linux/sched.h>
@@
-137,7
+137,7
@@
static int cmtp_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long
return -EINVAL;
}
return -EINVAL;
}
-static struct proto_ops cmtp_sock_ops = {
+static
const
struct proto_ops cmtp_sock_ops = {
.family = PF_BLUETOOTH,
.owner = THIS_MODULE,
.release = cmtp_sock_release,
.family = PF_BLUETOOTH,
.owner = THIS_MODULE,
.release = cmtp_sock_release,