diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-20 16:56:09 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-20 16:56:09 -0800 |
| commit | d0708b9739f4d184f74ef69fb15d9c26aecb3f10 (patch) | |
| tree | 7f96764d40111a29688e2b11551b7433889381b9 /drivers/media/video/bt8xx/bttvp.h | |
| parent | c52042ba5cd2071d9a69972d71997144d236e962 (diff) | |
| parent | 2434466432464110b5307757e0285dd41f15512e (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:
V4L/DVB: bttv: Move I2C IR initialization
V4L/DVB: Video : pwc : Fix regression in pwc_set_shutter_speed caused by bad constant => sizeof conversion.
soc-camera: mt9t112: modify exiting conditions from standby mode
V4L/DVB: cxusb: Select all required frontend and tuner modules
V4L/DVB: dvb: l64781.ko broken with gcc 4.5
Diffstat (limited to 'drivers/media/video/bt8xx/bttvp.h')
| -rw-r--r-- | drivers/media/video/bt8xx/bttvp.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/video/bt8xx/bttvp.h b/drivers/media/video/bt8xx/bttvp.h index a1d0e9c9f28..6cccc2a17ee 100644 --- a/drivers/media/video/bt8xx/bttvp.h +++ b/drivers/media/video/bt8xx/bttvp.h @@ -279,6 +279,7 @@ extern unsigned int bttv_debug; extern unsigned int bttv_gpio; extern void bttv_gpio_tracking(struct bttv *btv, char *comment); extern int init_bttv_i2c(struct bttv *btv); +extern void init_bttv_i2c_ir(struct bttv *btv); extern int fini_bttv_i2c(struct bttv *btv); #define bttv_printk if (bttv_verbose) printk |