From 4ebe62c24a11cde41baafa82cd46f15cfccc4192 Mon Sep 17 00:00:00 2001
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Date: Fri, 24 Sep 2010 08:39:19 -0300
Subject: [PATCH] --- yaml --- r: 219505 b: refs/heads/master c:
 2334e7902e4ff3d61b5dd808858f2ac3e276a551 h: refs/heads/master i:   219503:
 351c43f287d9b0febe3a9f9430d9f99e9cf663f0 v: v3

---
 [refs]                                     | 2 +-
 trunk/arch/sh/boards/mach-ecovec24/setup.c | 1 -
 trunk/arch/sh/boards/mach-se/7724/setup.c  | 1 -
 trunk/drivers/media/video/sh_vou.c         | 2 +-
 trunk/include/media/sh_vou.h               | 1 -
 5 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index cba83cb14892..c2f08119c339 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d4c0312363ad16a9991521aec7e19ffe85d49c2a
+refs/heads/master: 2334e7902e4ff3d61b5dd808858f2ac3e276a551
diff --git a/trunk/arch/sh/boards/mach-ecovec24/setup.c b/trunk/arch/sh/boards/mach-ecovec24/setup.c
index 1d7b495a7db4..4a9fa5d38540 100644
--- a/trunk/arch/sh/boards/mach-ecovec24/setup.c
+++ b/trunk/arch/sh/boards/mach-ecovec24/setup.c
@@ -793,7 +793,6 @@ static struct sh_vou_pdata sh_vou_pdata = {
 	.flags		= SH_VOU_HSYNC_LOW | SH_VOU_VSYNC_LOW,
 	.board_info	= &ak8813,
 	.i2c_adap	= 0,
-	.module_name	= "ak881x",
 };
 
 static struct resource sh_vou_resources[] = {
diff --git a/trunk/arch/sh/boards/mach-se/7724/setup.c b/trunk/arch/sh/boards/mach-se/7724/setup.c
index 552ebd9ba82b..8cc1d7295d85 100644
--- a/trunk/arch/sh/boards/mach-se/7724/setup.c
+++ b/trunk/arch/sh/boards/mach-se/7724/setup.c
@@ -550,7 +550,6 @@ static struct sh_vou_pdata sh_vou_pdata = {
 	.flags		= SH_VOU_HSYNC_LOW | SH_VOU_VSYNC_LOW,
 	.board_info	= &ak8813,
 	.i2c_adap	= 0,
-	.module_name	= "ak881x",
 };
 
 static struct resource sh_vou_resources[] = {
diff --git a/trunk/drivers/media/video/sh_vou.c b/trunk/drivers/media/video/sh_vou.c
index 195ac8651160..0f4906136b8f 100644
--- a/trunk/drivers/media/video/sh_vou.c
+++ b/trunk/drivers/media/video/sh_vou.c
@@ -1406,7 +1406,7 @@ static int __devinit sh_vou_probe(struct platform_device *pdev)
 		goto ereset;
 
 	subdev = v4l2_i2c_new_subdev_board(&vou_dev->v4l2_dev, i2c_adap,
-			vou_pdata->module_name, vou_pdata->board_info, NULL);
+			NULL, vou_pdata->board_info, NULL);
 	if (!subdev) {
 		ret = -ENOMEM;
 		goto ei2cnd;
diff --git a/trunk/include/media/sh_vou.h b/trunk/include/media/sh_vou.h
index a3ef30242b00..ec3ba9a597a2 100644
--- a/trunk/include/media/sh_vou.h
+++ b/trunk/include/media/sh_vou.h
@@ -28,7 +28,6 @@ struct sh_vou_pdata {
 	int i2c_adap;
 	struct i2c_board_info *board_info;
 	unsigned long flags;
-	char *module_name;
 };
 
 #endif