From 8a15f8055b90cd25e941e104ae959092167750d5 Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@stusta.de>
Date: Sat, 13 Oct 2007 23:56:30 +0200
Subject: [PATCH] --- yaml --- r: 68583 b: refs/heads/master c:
 83eaaed0d00c4c8e3081dc29286910899fed3182 h: refs/heads/master i:   68581:
 ade1e619478dbf81cb00b14da33cee441f09dea5   68579:
 e4bd07c0092529bdd38276f656d910f60dac1841   68575:
 d22824cc5e9a9dfbe1b690f3a91c85a9ae33613b v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/i2c/i2c-core.c | 7 +++----
 trunk/include/linux/i2c.h    | 2 --
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 81732b8fee44..48775758eb49 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3bbb835d4c53faf0bca62f0e39835926bef40b1f
+refs/heads/master: 83eaaed0d00c4c8e3081dc29286910899fed3182
diff --git a/trunk/drivers/i2c/i2c-core.c b/trunk/drivers/i2c/i2c-core.c
index 06b4b9e1a23e..f95b1b657618 100644
--- a/trunk/drivers/i2c/i2c-core.c
+++ b/trunk/drivers/i2c/i2c-core.c
@@ -186,7 +186,7 @@ static struct device_attribute i2c_dev_attrs[] = {
 	{ },
 };
 
-struct bus_type i2c_bus_type = {
+static struct bus_type i2c_bus_type = {
 	.name		= "i2c",
 	.dev_attrs	= i2c_dev_attrs,
 	.match		= i2c_device_match,
@@ -197,7 +197,6 @@ struct bus_type i2c_bus_type = {
 	.suspend	= i2c_device_suspend,
 	.resume		= i2c_device_resume,
 };
-EXPORT_SYMBOL_GPL(i2c_bus_type);
 
 /**
  * i2c_new_device - instantiate an i2c device for use with a new style driver
@@ -281,7 +280,7 @@ EXPORT_SYMBOL_GPL(i2c_unregister_device);
 
 /* I2C bus adapters -- one roots each I2C or SMBUS segment */
 
-void i2c_adapter_dev_release(struct device *dev)
+static void i2c_adapter_dev_release(struct device *dev)
 {
 	struct i2c_adapter *adap = to_i2c_adapter(dev);
 	complete(&adap->dev_released);
@@ -299,7 +298,7 @@ static struct device_attribute i2c_adapter_attrs[] = {
 	{ },
 };
 
-struct class i2c_adapter_class = {
+static struct class i2c_adapter_class = {
 	.owner			= THIS_MODULE,
 	.name			= "i2c-adapter",
 	.dev_attrs		= i2c_adapter_attrs,
diff --git a/trunk/include/linux/i2c.h b/trunk/include/linux/i2c.h
index e4793feac2bb..d4b63171d5d5 100644
--- a/trunk/include/linux/i2c.h
+++ b/trunk/include/linux/i2c.h
@@ -35,8 +35,6 @@
 #include <linux/sched.h>	/* for completion */
 #include <linux/mutex.h>
 
-extern struct bus_type i2c_bus_type;
-
 /* --- General options ------------------------------------------------	*/
 
 struct i2c_msg;