From c77bdcac1e209b23e304ca4afe7f900de9374177 Mon Sep 17 00:00:00 2001
From: "Lad, Prabhakar" <prabhakar.csengg@gmail.com>
Date: Wed, 20 Mar 2013 01:28:27 -0300
Subject: [PATCH] --- yaml --- r: 366729 b: refs/heads/master c:
 ced9b21ff626b6e6a23c06520ecb943f8d6ffa01 h: refs/heads/master i:   366727:
 c57e36d2e2819f725b08086e035c06437e49409c v: v3

---
 [refs]                                              |  2 +-
 trunk/drivers/media/platform/davinci/vpif.c         | 10 +++++++---
 trunk/drivers/media/platform/davinci/vpif.h         |  2 +-
 trunk/drivers/media/platform/davinci/vpif_capture.c |  2 +-
 trunk/drivers/media/platform/davinci/vpif_display.c |  2 +-
 5 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 3ad672c5c657..51967f3ea0d9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1c3fc152b8ebadd59814767e3189c961b73f20c8
+refs/heads/master: ced9b21ff626b6e6a23c06520ecb943f8d6ffa01
diff --git a/trunk/drivers/media/platform/davinci/vpif.c b/trunk/drivers/media/platform/davinci/vpif.c
index 28638a86f129..3bc4db8f0f27 100644
--- a/trunk/drivers/media/platform/davinci/vpif.c
+++ b/trunk/drivers/media/platform/davinci/vpif.c
@@ -44,13 +44,15 @@ static struct resource	*res;
 spinlock_t vpif_lock;
 
 void __iomem *vpif_base;
+EXPORT_SYMBOL_GPL(vpif_base);
+
 struct clk *vpif_clk;
 
 /**
- * ch_params: video standard configuration parameters for vpif
+ * vpif_ch_params: video standard configuration parameters for vpif
  * The table must include all presets from supported subdevices.
  */
-const struct vpif_channel_config_params ch_params[] = {
+const struct vpif_channel_config_params vpif_ch_params[] = {
 	/* HDTV formats */
 	{
 		.name = "480p59_94",
@@ -220,8 +222,10 @@ const struct vpif_channel_config_params ch_params[] = {
 		.stdid = V4L2_STD_625_50,
 	},
 };
+EXPORT_SYMBOL_GPL(vpif_ch_params);
 
-const unsigned int vpif_ch_params_count = ARRAY_SIZE(ch_params);
+const unsigned int vpif_ch_params_count = ARRAY_SIZE(vpif_ch_params);
+EXPORT_SYMBOL_GPL(vpif_ch_params_count);
 
 static inline void vpif_wr_bit(u32 reg, u32 bit, u32 val)
 {
diff --git a/trunk/drivers/media/platform/davinci/vpif.h b/trunk/drivers/media/platform/davinci/vpif.h
index a1ab6a0f4e9e..9956e6788693 100644
--- a/trunk/drivers/media/platform/davinci/vpif.h
+++ b/trunk/drivers/media/platform/davinci/vpif.h
@@ -638,7 +638,7 @@ struct vpif_channel_config_params {
 };
 
 extern const unsigned int vpif_ch_params_count;
-extern const struct vpif_channel_config_params ch_params[];
+extern const struct vpif_channel_config_params vpif_ch_params[];
 
 struct vpif_video_params;
 struct vpif_params;
diff --git a/trunk/drivers/media/platform/davinci/vpif_capture.c b/trunk/drivers/media/platform/davinci/vpif_capture.c
index 1943e41f3866..d869c8e868ee 100644
--- a/trunk/drivers/media/platform/davinci/vpif_capture.c
+++ b/trunk/drivers/media/platform/davinci/vpif_capture.c
@@ -563,7 +563,7 @@ static int vpif_update_std_info(struct channel_obj *ch)
 	vpif_dbg(2, debug, "vpif_update_std_info\n");
 
 	for (index = 0; index < vpif_ch_params_count; index++) {
-		config = &ch_params[index];
+		config = &vpif_ch_params[index];
 		if (config->hd_sd == 0) {
 			vpif_dbg(2, debug, "SD format\n");
 			if (config->stdid & vid_ch->stdid) {
diff --git a/trunk/drivers/media/platform/davinci/vpif_display.c b/trunk/drivers/media/platform/davinci/vpif_display.c
index 5477c2cb8653..3bb187c9402b 100644
--- a/trunk/drivers/media/platform/davinci/vpif_display.c
+++ b/trunk/drivers/media/platform/davinci/vpif_display.c
@@ -511,7 +511,7 @@ static int vpif_update_std_info(struct channel_obj *ch)
 	int i;
 
 	for (i = 0; i < vpif_ch_params_count; i++) {
-		config = &ch_params[i];
+		config = &vpif_ch_params[i];
 		if (config->hd_sd == 0) {
 			vpif_dbg(2, debug, "SD format\n");
 			if (config->stdid & vid_ch->stdid) {