diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2009-10-05 03:30:10 -0400 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2009-10-05 03:30:10 -0400 |
| commit | 5d13379a4dba717fb75b749acc0f928c2c02db17 (patch) | |
| tree | ab5bf870206e6ea8e744390cdb37cb14f7e78257 /drivers/w1/w1_netlink.c | |
| parent | 08dc8726d4be85bca793141c827574fd32a681bb (diff) | |
| parent | 374576a8b6f865022c0fd1ca62396889b23d66dd (diff) | |
Merge branch 'master' into for-2.6.33
Diffstat (limited to 'drivers/w1/w1_netlink.c')
| -rw-r--r-- | drivers/w1/w1_netlink.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/w1/w1_netlink.c b/drivers/w1/w1_netlink.c index 52ccb3d3a963..45c126fea31d 100644 --- 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 | |||
| 306 | return error; | 306 | return error; |
| 307 | } | 307 | } |
| 308 | 308 | ||
| 309 | static void w1_cn_callback(struct cn_msg *msg) | 309 | static void w1_cn_callback(struct cn_msg *msg, struct netlink_skb_parms *nsp) |
| 310 | { | 310 | { |
| 311 | struct w1_netlink_msg *m = (struct w1_netlink_msg *)(msg + 1); | 311 | struct w1_netlink_msg *m = (struct w1_netlink_msg *)(msg + 1); |
| 312 | struct w1_netlink_cmd *cmd; | 312 | struct w1_netlink_cmd *cmd; |