From 08f7163569a31cceb44ec5ab3fc65f6b1c64b15a Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@osdl.org>
Date: Fri, 23 Jun 2006 02:05:46 -0700
Subject: [PATCH] --- yaml --- r: 29066 b: refs/heads/master c:
 deb0e9b234af24f4a827757fae9ff5542a3d2a12 h: refs/heads/master v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/connector/connector.c | 7 +++----
 trunk/drivers/w1/Kconfig            | 1 +
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 83f5e52ef00b..6e7105688196 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 66f969d064e46e6690c3426e2af846e76fb80e83
+refs/heads/master: deb0e9b234af24f4a827757fae9ff5542a3d2a12
diff --git a/trunk/drivers/connector/connector.c b/trunk/drivers/connector/connector.c
index 79d581c86520..b49bacfd8de8 100644
--- a/trunk/drivers/connector/connector.c
+++ b/trunk/drivers/connector/connector.c
@@ -121,6 +121,7 @@ int cn_netlink_send(struct cn_msg *msg, u32 __group, gfp_t gfp_mask)
 	kfree_skb(skb);
 	return -EINVAL;
 }
+EXPORT_SYMBOL_GPL(cn_netlink_send);
 
 /*
  * Callback helper - queues work and setup destructor for given data.
@@ -319,6 +320,7 @@ int cn_add_callback(struct cb_id *id, char *name, void (*callback)(void *))
 
 	return 0;
 }
+EXPORT_SYMBOL_GPL(cn_add_callback);
 
 /*
  * Callback remove routing - removes callback
@@ -335,6 +337,7 @@ void cn_del_callback(struct cb_id *id)
 	cn_queue_del_callback(dev->cbdev, id);
 	cn_notify(id, 1);
 }
+EXPORT_SYMBOL_GPL(cn_del_callback);
 
 /*
  * Checks two connector's control messages to be the same.
@@ -488,7 +491,3 @@ static void __devexit cn_fini(void)
 
 subsys_initcall(cn_init);
 module_exit(cn_fini);
-
-EXPORT_SYMBOL_GPL(cn_add_callback);
-EXPORT_SYMBOL_GPL(cn_del_callback);
-EXPORT_SYMBOL_GPL(cn_netlink_send);
diff --git a/trunk/drivers/w1/Kconfig b/trunk/drivers/w1/Kconfig
index f2d9a08e89ae..8b3d0f0c7bd5 100644
--- a/trunk/drivers/w1/Kconfig
+++ b/trunk/drivers/w1/Kconfig
@@ -2,6 +2,7 @@ menu "Dallas's 1-wire bus"
 
 config W1
 	tristate "Dallas's 1-wire support"
+	depends on CONNECTOR
 	---help---
 	  Dallas' 1-wire bus is useful to connect slow 1-pin devices
 	  such as iButtons and thermal sensors.