diff options
| author | David S. Miller <davem@davemloft.net> | 2009-10-07 05:43:16 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-10-07 05:43:16 (GMT) |
| commit | 7ecc59c1b7fd5749667fc31f8683099cbef38977 (patch) | |
| tree | 560d8ce48fac50758d1af6d722bc0bb0c7de2a34 /drivers/connector/cn_proc.c | |
| parent | bcdce7195e0eab55b37dbd53be53057f38006380 (diff) | |
| parent | 1cec9727fbfd7baff2034796154be1a0297bcedd (diff) | |
| download | linux-fsl-qoriq-7ecc59c1b7fd5749667fc31f8683099cbef38977.tar.xz | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/connector/cn_proc.c')
| -rw-r--r-- | drivers/connector/cn_proc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/connector/cn_proc.c b/drivers/connector/cn_proc.c index abf4a25..6069790 100644 --- a/drivers/connector/cn_proc.c +++ b/drivers/connector/cn_proc.c @@ -227,7 +227,8 @@ static void cn_proc_ack(int err, int rcvd_seq, int rcvd_ack) * cn_proc_mcast_ctl * @data: message sent from userspace via the connector */ -static void cn_proc_mcast_ctl(struct cn_msg *msg) +static void cn_proc_mcast_ctl(struct cn_msg *msg, + struct netlink_skb_parms *nsp) { enum proc_cn_mcast_op *mc_op = NULL; int err = 0; |