summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/bt8xx
diff options
context:
space:
mode:
authorPatrick Boettcher <pb@linuxtv.org>2008-12-10 22:28:25 +0100
committerPatrick Boettcher <pb@linuxtv.org>2008-12-10 22:28:25 +0100
commita9efe23fbe1000bff6e24012a5b580f9a8b93a92 (patch)
tree0308e2214bcc86e348e5d731d6bf958f1d4bf54f /linux/drivers/media/video/bt8xx
parent12583b9f4af4d04cce76742c9859bff4068e6345 (diff)
parent97b478e31ccddc358a73628542bb2d32983abeac (diff)
downloadmediapointer-dvb-s2-a9efe23fbe1000bff6e24012a5b580f9a8b93a92.tar.gz
mediapointer-dvb-s2-a9efe23fbe1000bff6e24012a5b580f9a8b93a92.tar.bz2
sync from main
From: Patrick Boettcher <pb@linuxtv.org> sync from main Priority: normal Signed-off-by: Patrick Boettcher <pb@linuxtv.org>
Diffstat (limited to 'linux/drivers/media/video/bt8xx')
-rw-r--r--linux/drivers/media/video/bt8xx/bttv-i2c.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/linux/drivers/media/video/bt8xx/bttv-i2c.c b/linux/drivers/media/video/bt8xx/bttv-i2c.c
index bcd2cd240..558572589 100644
--- a/linux/drivers/media/video/bt8xx/bttv-i2c.c
+++ b/linux/drivers/media/video/bt8xx/bttv-i2c.c
@@ -260,6 +260,9 @@ static int bttv_i2c_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg *msgs, int
static const struct i2c_algorithm bttv_algo = {
.master_xfer = bttv_i2c_xfer,
.functionality = functionality,
+#ifdef NEED_ALGO_CONTROL
+ .algo_control = dummy_algo_control,
+#endif
};
/* ----------------------------------------------------------------------- */