From 5954ee2dc898efaa47218b1965b304d1d8e01d49 Mon Sep 17 00:00:00 2001
From: Stephen Boyd <bebarino@gmail.com>
Date: Tue, 6 Oct 2009 01:39:51 -0700
Subject: [PATCH] --- yaml --- r: 166975 b: refs/heads/master c:
 f0b25932b8e60e96f5f371b27442e560803ac6f5 h: refs/heads/master i:   166973:
 2d6e519d13d613f5dbba8aed80de610cab0a5d84   166971:
 501c7ba9be8bdfb66e943858fb973fd959159e09   166967:
 56183edcfff5ab705669b46ea4274ad342372eb7   166959:
 e7120f4050654f621015257c1bbfd482b0c130b0   166943:
 67d7f5037f0428d85f66231e3b5b49d5b6212e7b   166911:
 ef70879ccc11ebc6d0113d9415de64982ccda17a v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/connector/cn_proc.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 7043ae2b348d..9033f3dff1fa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a160ee69c6a4622ed30c377a978554015e9931cb
+refs/heads/master: f0b25932b8e60e96f5f371b27442e560803ac6f5
diff --git a/trunk/drivers/connector/cn_proc.c b/trunk/drivers/connector/cn_proc.c
index abf4a2529f80..60697909ebdb 100644
--- a/trunk/drivers/connector/cn_proc.c
+++ b/trunk/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;