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 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[cascardo/linux.git]
/
drivers
/
w1
/
w1_netlink.c
diff --git
a/drivers/w1/w1_netlink.c
b/drivers/w1/w1_netlink.c
index
52ccb3d
..
45c126f
100644
(file)
--- a/
drivers/w1/w1_netlink.c
+++ b/
drivers/w1/w1_netlink.c
@@
-306,7
+306,7
@@
static int w1_netlink_send_error(struct cn_msg *rcmsg, struct w1_netlink_msg *rm
return error;
}
-static void w1_cn_callback(struct cn_msg *msg)
+static void w1_cn_callback(struct cn_msg *msg
, struct netlink_skb_parms *nsp
)
{
struct w1_netlink_msg *m = (struct w1_netlink_msg *)(msg + 1);
struct w1_netlink_cmd *cmd;