diff options
author | Jens Axboe <jaxboe@fusionio.com> | 2011-03-01 15:04:39 -0500 |
---|---|---|
committer | Jens Axboe <jaxboe@fusionio.com> | 2011-03-01 15:04:39 -0500 |
commit | 6fae9c25134baffbeeb20031479e7ff6f6d8eec0 (patch) | |
tree | c9ab89992ce5293a43cd455a81dc8a5926a28a5e /include/media/soc_camera.h | |
parent | c186794dbb466b45cf40f942f2d09d6d5b4b0e42 (diff) | |
parent | f5412be599602124d2bdd49947b231dd77c0bf99 (diff) |
Merge commit 'v2.6.38-rc6' into for-2.6.39/core
Conflicts:
block/cfq-iosched.c
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Diffstat (limited to 'include/media/soc_camera.h')
-rw-r--r-- | include/media/soc_camera.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/media/soc_camera.h b/include/media/soc_camera.h index 86e3631764e..9386db829fb 100644 --- a/include/media/soc_camera.h +++ b/include/media/soc_camera.h | |||
@@ -97,6 +97,7 @@ struct soc_camera_host_ops { | |||
97 | #define SOCAM_SENSOR_INVERT_DATA (1 << 4) | 97 | #define SOCAM_SENSOR_INVERT_DATA (1 << 4) |
98 | 98 | ||
99 | struct i2c_board_info; | 99 | struct i2c_board_info; |
100 | struct regulator_bulk_data; | ||
100 | 101 | ||
101 | struct soc_camera_link { | 102 | struct soc_camera_link { |
102 | /* Camera bus id, used to match a camera and a bus */ | 103 | /* Camera bus id, used to match a camera and a bus */ |
@@ -108,6 +109,10 @@ struct soc_camera_link { | |||
108 | const char *module_name; | 109 | const char *module_name; |
109 | void *priv; | 110 | void *priv; |
110 | 111 | ||
112 | /* Optional regulators that have to be managed on power on/off events */ | ||
113 | struct regulator_bulk_data *regulators; | ||
114 | int num_regulators; | ||
115 | |||
111 | /* | 116 | /* |
112 | * For non-I2C devices platform platform has to provide methods to | 117 | * For non-I2C devices platform platform has to provide methods to |
113 | * add a device to the system and to remove | 118 | * add a device to the system and to remove |