diff options
-rw-r--r-- | arch/sh/boards/mach-ecovec24/setup.c | 1 | ||||
-rw-r--r-- | arch/sh/boards/mach-se/7724/setup.c | 1 | ||||
-rw-r--r-- | drivers/media/video/sh_vou.c | 2 | ||||
-rw-r--r-- | include/media/sh_vou.h | 1 |
4 files changed, 1 insertions, 4 deletions
diff --git a/arch/sh/boards/mach-ecovec24/setup.c b/arch/sh/boards/mach-ecovec24/setup.c index 1d7b495a7db4..4a9fa5d38540 100644 --- a/arch/sh/boards/mach-ecovec24/setup.c +++ b/arch/sh/boards/mach-ecovec24/setup.c | |||
@@ -793,7 +793,6 @@ static struct sh_vou_pdata sh_vou_pdata = { | |||
793 | .flags = SH_VOU_HSYNC_LOW | SH_VOU_VSYNC_LOW, | 793 | .flags = SH_VOU_HSYNC_LOW | SH_VOU_VSYNC_LOW, |
794 | .board_info = &ak8813, | 794 | .board_info = &ak8813, |
795 | .i2c_adap = 0, | 795 | .i2c_adap = 0, |
796 | .module_name = "ak881x", | ||
797 | }; | 796 | }; |
798 | 797 | ||
799 | static struct resource sh_vou_resources[] = { | 798 | static struct resource sh_vou_resources[] = { |
diff --git a/arch/sh/boards/mach-se/7724/setup.c b/arch/sh/boards/mach-se/7724/setup.c index 552ebd9ba82b..8cc1d7295d85 100644 --- a/arch/sh/boards/mach-se/7724/setup.c +++ b/arch/sh/boards/mach-se/7724/setup.c | |||
@@ -550,7 +550,6 @@ static struct sh_vou_pdata sh_vou_pdata = { | |||
550 | .flags = SH_VOU_HSYNC_LOW | SH_VOU_VSYNC_LOW, | 550 | .flags = SH_VOU_HSYNC_LOW | SH_VOU_VSYNC_LOW, |
551 | .board_info = &ak8813, | 551 | .board_info = &ak8813, |
552 | .i2c_adap = 0, | 552 | .i2c_adap = 0, |
553 | .module_name = "ak881x", | ||
554 | }; | 553 | }; |
555 | 554 | ||
556 | static struct resource sh_vou_resources[] = { | 555 | static struct resource sh_vou_resources[] = { |
diff --git a/drivers/media/video/sh_vou.c b/drivers/media/video/sh_vou.c index 195ac8651160..0f4906136b8f 100644 --- a/drivers/media/video/sh_vou.c +++ b/drivers/media/video/sh_vou.c | |||
@@ -1406,7 +1406,7 @@ static int __devinit sh_vou_probe(struct platform_device *pdev) | |||
1406 | goto ereset; | 1406 | goto ereset; |
1407 | 1407 | ||
1408 | subdev = v4l2_i2c_new_subdev_board(&vou_dev->v4l2_dev, i2c_adap, | 1408 | subdev = v4l2_i2c_new_subdev_board(&vou_dev->v4l2_dev, i2c_adap, |
1409 | vou_pdata->module_name, vou_pdata->board_info, NULL); | 1409 | NULL, vou_pdata->board_info, NULL); |
1410 | if (!subdev) { | 1410 | if (!subdev) { |
1411 | ret = -ENOMEM; | 1411 | ret = -ENOMEM; |
1412 | goto ei2cnd; | 1412 | goto ei2cnd; |
diff --git a/include/media/sh_vou.h b/include/media/sh_vou.h index a3ef30242b00..ec3ba9a597a2 100644 --- a/include/media/sh_vou.h +++ b/include/media/sh_vou.h | |||
@@ -28,7 +28,6 @@ struct sh_vou_pdata { | |||
28 | int i2c_adap; | 28 | int i2c_adap; |
29 | struct i2c_board_info *board_info; | 29 | struct i2c_board_info *board_info; |
30 | unsigned long flags; | 30 | unsigned long flags; |
31 | char *module_name; | ||
32 | }; | 31 | }; |
33 | 32 | ||
34 | #endif | 33 | #endif |