From 3d401a59367e1628d9c524c007e0677b7c29814c Mon Sep 17 00:00:00 2001
From: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Date: Mon, 26 Jul 2010 11:37:13 -0300
Subject: [PATCH] --- yaml --- r: 202151 b: refs/heads/master c:
 52d268a36246ee4156cc719036522616bb4d73fa h: refs/heads/master i:   202149:
 b3040acbd8861636482f31468eb407051bba2f74   202147:
 1733f2afa53e07198b1aad9eacdacd9fadf495ea   202143:
 1b04f88ae9faebaba6f03f59c6f5f28cbc86d86a v: v3

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

diff --git a/[refs] b/[refs]
index ffaa6ee616d9..e254d511b092 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c6b65ab78bebf5ceaa8de53d8a9c4f5e34e45e57
+refs/heads/master: 52d268a36246ee4156cc719036522616bb4d73fa
diff --git a/trunk/drivers/media/video/soc_camera.c b/trunk/drivers/media/video/soc_camera.c
index 475757bfd7ba..f2032939fd4b 100644
--- a/trunk/drivers/media/video/soc_camera.c
+++ b/trunk/drivers/media/video/soc_camera.c
@@ -1107,13 +1107,14 @@ static int soc_camera_resume(struct device *dev)
 	return ret;
 }
 
-static struct bus_type soc_camera_bus_type = {
+struct bus_type soc_camera_bus_type = {
 	.name		= "soc-camera",
 	.probe		= soc_camera_probe,
 	.remove		= soc_camera_remove,
 	.suspend	= soc_camera_suspend,
 	.resume		= soc_camera_resume,
 };
+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 b8289c2f609b..2ce957301f77 100644
--- a/trunk/include/media/soc_camera.h
+++ b/trunk/include/media/soc_camera.h
@@ -12,12 +12,15 @@
 #ifndef SOC_CAMERA_H
 #define SOC_CAMERA_H
 
+#include <linux/device.h>
 #include <linux/mutex.h>
 #include <linux/pm.h>
 #include <linux/videodev2.h>
 #include <media/videobuf-core.h>
 #include <media/v4l2-device.h>
 
+extern struct bus_type soc_camera_bus_type;
+
 struct soc_camera_device {
 	struct list_head list;
 	struct device dev;