diff options
| author | Jean-Francois Moine <moinejf@free.fr> | 2008-11-26 08:47:12 +0100 |
|---|---|---|
| committer | Jean-Francois Moine <moinejf@free.fr> | 2008-11-26 08:47:12 +0100 |
| commit | 891faaaa42567c3609045cff7972d61268b53b8e (patch) | |
| tree | 96dd8ac4262bb382966109878286aa8388103e05 /linux/drivers/media/common/saa7146_i2c.c | |
| parent | d6fee5ac91e4b7196341e6da1708ce5b4481cd79 (diff) | |
| parent | 1f3f7671e12715041b3b002db1403ce4da682fda (diff) | |
| download | mediapointer-dvb-s2-891faaaa42567c3609045cff7972d61268b53b8e.tar.gz mediapointer-dvb-s2-891faaaa42567c3609045cff7972d61268b53b8e.tar.bz2 | |
merge: v4l-dvb
Diffstat (limited to 'linux/drivers/media/common/saa7146_i2c.c')
| -rw-r--r-- | linux/drivers/media/common/saa7146_i2c.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/linux/drivers/media/common/saa7146_i2c.c b/linux/drivers/media/common/saa7146_i2c.c index ae20d2729..255b14551 100644 --- a/linux/drivers/media/common/saa7146_i2c.c +++ b/linux/drivers/media/common/saa7146_i2c.c @@ -406,6 +406,9 @@ static int saa7146_i2c_xfer(struct i2c_adapter* adapter, struct i2c_msg *msg, in static struct i2c_algorithm saa7146_algo = { .master_xfer = saa7146_i2c_xfer, .functionality = saa7146_i2c_func, +#ifdef NEED_ALGO_CONTROL + .algo_control = dummy_algo_control, +#endif }; int saa7146_i2c_adapter_prepare(struct saa7146_dev *dev, struct i2c_adapter *i2c_adapter, u32 bitrate) |