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 ...
Cette révision appartient à :
@@ -481,7 +481,6 @@ static struct soc_camera_link ov7725_link = {
|
||||
.power = ov7725_power,
|
||||
.board_info = &ap325rxa_i2c_camera[0],
|
||||
.i2c_adapter_id = 0,
|
||||
.module_name = "ov772x",
|
||||
.priv = &ov7725_info,
|
||||
};
|
||||
|
||||
|
@@ -620,7 +620,6 @@ static struct soc_camera_link tw9910_link = {
|
||||
.bus_id = 1,
|
||||
.power = tw9910_power,
|
||||
.board_info = &i2c_camera[0],
|
||||
.module_name = "tw9910",
|
||||
.priv = &tw9910_info,
|
||||
};
|
||||
|
||||
@@ -644,7 +643,6 @@ static struct soc_camera_link mt9t112_link1 = {
|
||||
.power = mt9t112_power1,
|
||||
.bus_id = 0,
|
||||
.board_info = &i2c_camera[1],
|
||||
.module_name = "mt9t112",
|
||||
.priv = &mt9t112_info1,
|
||||
};
|
||||
|
||||
@@ -667,7 +665,6 @@ static struct soc_camera_link mt9t112_link2 = {
|
||||
.power = mt9t112_power2,
|
||||
.bus_id = 1,
|
||||
.board_info = &i2c_camera[2],
|
||||
.module_name = "mt9t112",
|
||||
.priv = &mt9t112_info2,
|
||||
};
|
||||
|
||||
@@ -793,7 +790,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[] = {
|
||||
|
@@ -333,7 +333,6 @@ static struct soc_camera_link rj54n1_link = {
|
||||
.power = camera_power,
|
||||
.board_info = &kfr2r09_i2c_camera,
|
||||
.i2c_adapter_id = 1,
|
||||
.module_name = "rj54n1cb0c",
|
||||
.priv = &rj54n1_priv,
|
||||
};
|
||||
|
||||
|
@@ -450,7 +450,6 @@ static struct soc_camera_link ov7725_link = {
|
||||
.power = ov7725_power,
|
||||
.board_info = &migor_i2c_camera[0],
|
||||
.i2c_adapter_id = 0,
|
||||
.module_name = "ov772x",
|
||||
.priv = &ov7725_info,
|
||||
};
|
||||
|
||||
@@ -463,7 +462,6 @@ static struct soc_camera_link tw9910_link = {
|
||||
.power = tw9910_power,
|
||||
.board_info = &migor_i2c_camera[1],
|
||||
.i2c_adapter_id = 0,
|
||||
.module_name = "tw9910",
|
||||
.priv = &tw9910_info,
|
||||
};
|
||||
|
||||
|
@@ -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[] = {
|
||||
|
Référencer dans un nouveau ticket
Bloquer un utilisateur