diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-05-09 05:48:08 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-05-09 05:48:08 -0300 |
commit | d54da4a86ac71c49e0b100b4911a7695d37e93df (patch) | |
tree | e1e126eb4790f433b97b3a1c4c338d0356364cf7 /linux/include/media/soc_camera.h | |
parent | dc4477a76160f919e3f0d05c715c12b0dbd600a6 (diff) | |
parent | ee56997de9033d06c740726754437b09ddebb039 (diff) | |
download | mediapointer-dvb-s2-d54da4a86ac71c49e0b100b4911a7695d37e93df.tar.gz mediapointer-dvb-s2-d54da4a86ac71c49e0b100b4911a7695d37e93df.tar.bz2 |
merge: http://linuxtv.org/hg/~gliakhovetski/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/include/media/soc_camera.h')
-rw-r--r-- | linux/include/media/soc_camera.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/linux/include/media/soc_camera.h b/linux/include/media/soc_camera.h index bef5e81d6..23ecead35 100644 --- a/linux/include/media/soc_camera.h +++ b/linux/include/media/soc_camera.h @@ -92,11 +92,16 @@ struct soc_camera_host_ops { #define SOCAM_SENSOR_INVERT_VSYNC (1 << 3) #define SOCAM_SENSOR_INVERT_DATA (1 << 4) +struct i2c_board_info; + struct soc_camera_link { /* Camera bus id, used to match a camera and a bus */ int bus_id; /* Per camera SOCAM_SENSOR_* bus flags */ unsigned long flags; + int i2c_adapter_id; + struct i2c_board_info *board_info; + const char *module_name; /* Optional callbacks to power on or off and reset the sensor */ int (*power)(struct device *, int); int (*reset)(struct device *); |