From edc0e6a07c5408ee317ab9da3d4667a6694078f3 Mon Sep 17 00:00:00 2001
From: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Date: Fri, 1 Jul 2011 11:31:35 -0300
Subject: [PATCH] --- yaml --- r: 261599 b: refs/heads/master c:
 d33b290a149dafe2e3cc2901ec726bea09a2c0f4 h: refs/heads/master i:   261597:
 631dd5e4d325038c163e64da8748aa4af09b40ff   261595:
 c3f98052437e4abbaaec030005a0891ec1d71e0a   261591:
 a4a7a59fbe292e31ce13cad010af417124495528   261583:
 8caa90ec9006be411e3ba7bd0cc5b02972814330   261567:
 908fbc1e87d47f561ed407c8e535f5e60a31797f v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/media/video/soc_camera.c | 3 +--
 trunk/include/media/soc_camera.h       | 8 +++-----
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 49a45b544701..1e858a65f570 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6b526fed0e688e3926bd43a09f2f36cba3983ce2
+refs/heads/master: d33b290a149dafe2e3cc2901ec726bea09a2c0f4
diff --git a/trunk/drivers/media/video/soc_camera.c b/trunk/drivers/media/video/soc_camera.c
index 96bed292c548..0df31b54e906 100644
--- a/trunk/drivers/media/video/soc_camera.c
+++ b/trunk/drivers/media/video/soc_camera.c
@@ -1207,12 +1207,11 @@ static int soc_camera_remove(struct device *dev)
 	return 0;
 }
 
-struct bus_type soc_camera_bus_type = {
+static struct bus_type soc_camera_bus_type = {
 	.name		= "soc-camera",
 	.probe		= soc_camera_probe,
 	.remove		= soc_camera_remove,
 };
-EXPORT_SYMBOL_GPL(soc_camera_bus_type);
 
 static struct device_driver ic_drv = {
 	.name	= "camera",
diff --git a/trunk/include/media/soc_camera.h b/trunk/include/media/soc_camera.h
index 70c4ea5ecc31..c31d55be3e17 100644
--- a/trunk/include/media/soc_camera.h
+++ b/trunk/include/media/soc_camera.h
@@ -20,12 +20,10 @@
 #include <media/videobuf2-core.h>
 #include <media/v4l2-device.h>
 
-extern struct bus_type soc_camera_bus_type;
-
 struct file;
 
 struct soc_camera_device {
-	struct list_head list;
+	struct list_head list;		/* list of all registered devices */
 	struct device dev;
 	struct device *pdev;		/* Platform device */
 	s32 user_width;
@@ -126,8 +124,8 @@ struct soc_camera_link {
 	int num_regulators;
 
 	/*
-	 * For non-I2C devices platform platform has to provide methods to
-	 * add a device to the system and to remove
+	 * For non-I2C devices platform has to provide methods to add a device
+	 * to the system and to remove it
 	 */
 	int (*add_device)(struct soc_camera_link *, struct device *);
 	void (*del_device)(struct soc_camera_link *);