aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sh/boards
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-10-28 12:35:11 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2010-10-28 12:35:11 -0400
commit0851668fdd97e526b2a41f794b785c204dd3d3e0 (patch)
tree4ef7c20a8be8393006c6fe9627eb29dd30877d61 /arch/sh/boards
parent00ebb6382b8d9c7c15b5f8ad230670d8161d38dd (diff)
parent7655e594945289b418af39f6669fea4666a7b520 (diff)
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6
* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (505 commits) [media] af9015: Fix max I2C message size when used with tda18271 [media] IR: initialize ir_raw_event in few more drivers [media] Guard a divide in v4l1 compat layer [media] imon: fix nomouse modprobe option [media] imon: remove redundant change_protocol call [media] imon: fix my egregious brown paper bag w/rdev/idev split [media] cafe_ccic: Configure ov7670 correctly [media] ov7670: allow configuration of image size, clock speed, and I/O method [media] af9015: support for DigitalNow TinyTwin v3 [1f4d:9016] [media] af9015: map DigitalNow TinyTwin v2 remote [media] DigitalNow TinyTwin remote controller [media] af9015: RC fixes and improvements videodev2.h.xml: Update to reflect the latest changes at videodev2.h [media] v4l: document new Bayer and monochrome pixel formats [media] DocBook/v4l: Add missing formats used on gspca cpia1 and sn9c2028 [media] firedtv: add parameter to fake ca_system_ids in CA_INFO [media] tm6000: fix a macro coding style issue tm6000: Remove some ugly debug code [media] Nova-S-Plus audio line input [media] [RFC,1/1] V4L2: Use new CAP bits in existing RDS capable drivers ...
Diffstat (limited to 'arch/sh/boards')
-rw-r--r--arch/sh/boards/mach-ap325rxa/setup.c1
-rw-r--r--arch/sh/boards/mach-ecovec24/setup.c4
-rw-r--r--arch/sh/boards/mach-kfr2r09/setup.c1
-rw-r--r--arch/sh/boards/mach-migor/setup.c2
-rw-r--r--arch/sh/boards/mach-se/7724/setup.c1
5 files changed, 0 insertions, 9 deletions
diff --git a/arch/sh/boards/mach-ap325rxa/setup.c b/arch/sh/boards/mach-ap325rxa/setup.c
index 3da116f47f01..881a3a5f5647 100644
--- a/arch/sh/boards/mach-ap325rxa/setup.c
+++ b/arch/sh/boards/mach-ap325rxa/setup.c
@@ -481,7 +481,6 @@ static struct soc_camera_link ov7725_link = {
481 .power = ov7725_power, 481 .power = ov7725_power,
482 .board_info = &ap325rxa_i2c_camera[0], 482 .board_info = &ap325rxa_i2c_camera[0],
483 .i2c_adapter_id = 0, 483 .i2c_adapter_id = 0,
484 .module_name = "ov772x",
485 .priv = &ov7725_info, 484 .priv = &ov7725_info,
486}; 485};
487 486
diff --git a/arch/sh/boards/mach-ecovec24/setup.c b/arch/sh/boards/mach-ecovec24/setup.c
index 71a3368ab1fc..ddc7e4e4d2a0 100644
--- a/arch/sh/boards/mach-ecovec24/setup.c
+++ b/arch/sh/boards/mach-ecovec24/setup.c
@@ -620,7 +620,6 @@ static struct soc_camera_link tw9910_link = {
620 .bus_id = 1, 620 .bus_id = 1,
621 .power = tw9910_power, 621 .power = tw9910_power,
622 .board_info = &i2c_camera[0], 622 .board_info = &i2c_camera[0],
623 .module_name = "tw9910",
624 .priv = &tw9910_info, 623 .priv = &tw9910_info,
625}; 624};
626 625
@@ -644,7 +643,6 @@ static struct soc_camera_link mt9t112_link1 = {
644 .power = mt9t112_power1, 643 .power = mt9t112_power1,
645 .bus_id = 0, 644 .bus_id = 0,
646 .board_info = &i2c_camera[1], 645 .board_info = &i2c_camera[1],
647 .module_name = "mt9t112",
648 .priv = &mt9t112_info1, 646 .priv = &mt9t112_info1,
649}; 647};
650 648
@@ -667,7 +665,6 @@ static struct soc_camera_link mt9t112_link2 = {
667 .power = mt9t112_power2, 665 .power = mt9t112_power2,
668 .bus_id = 1, 666 .bus_id = 1,
669 .board_info = &i2c_camera[2], 667 .board_info = &i2c_camera[2],
670 .module_name = "mt9t112",
671 .priv = &mt9t112_info2, 668 .priv = &mt9t112_info2,
672}; 669};
673 670
@@ -793,7 +790,6 @@ static struct sh_vou_pdata sh_vou_pdata = {
793 .flags = SH_VOU_HSYNC_LOW | SH_VOU_VSYNC_LOW, 790 .flags = SH_VOU_HSYNC_LOW | SH_VOU_VSYNC_LOW,
794 .board_info = &ak8813, 791 .board_info = &ak8813,
795 .i2c_adap = 0, 792 .i2c_adap = 0,
796 .module_name = "ak881x",
797}; 793};
798 794
799static struct resource sh_vou_resources[] = { 795static struct resource sh_vou_resources[] = {
diff --git a/arch/sh/boards/mach-kfr2r09/setup.c b/arch/sh/boards/mach-kfr2r09/setup.c
index 68994a163f6c..1742849db648 100644
--- a/arch/sh/boards/mach-kfr2r09/setup.c
+++ b/arch/sh/boards/mach-kfr2r09/setup.c
@@ -333,7 +333,6 @@ static struct soc_camera_link rj54n1_link = {
333 .power = camera_power, 333 .power = camera_power,
334 .board_info = &kfr2r09_i2c_camera, 334 .board_info = &kfr2r09_i2c_camera,
335 .i2c_adapter_id = 1, 335 .i2c_adapter_id = 1,
336 .module_name = "rj54n1cb0c",
337 .priv = &rj54n1_priv, 336 .priv = &rj54n1_priv,
338}; 337};
339 338
diff --git a/arch/sh/boards/mach-migor/setup.c b/arch/sh/boards/mach-migor/setup.c
index 662debe4ead2..03af84842559 100644
--- a/arch/sh/boards/mach-migor/setup.c
+++ b/arch/sh/boards/mach-migor/setup.c
@@ -450,7 +450,6 @@ static struct soc_camera_link ov7725_link = {
450 .power = ov7725_power, 450 .power = ov7725_power,
451 .board_info = &migor_i2c_camera[0], 451 .board_info = &migor_i2c_camera[0],
452 .i2c_adapter_id = 0, 452 .i2c_adapter_id = 0,
453 .module_name = "ov772x",
454 .priv = &ov7725_info, 453 .priv = &ov7725_info,
455}; 454};
456 455
@@ -463,7 +462,6 @@ static struct soc_camera_link tw9910_link = {
463 .power = tw9910_power, 462 .power = tw9910_power,
464 .board_info = &migor_i2c_camera[1], 463 .board_info = &migor_i2c_camera[1],
465 .i2c_adapter_id = 0, 464 .i2c_adapter_id = 0,
466 .module_name = "tw9910",
467 .priv = &tw9910_info, 465 .priv = &tw9910_info,
468}; 466};
469 467
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
556static struct resource sh_vou_resources[] = { 555static struct resource sh_vou_resources[] = {