diff options
| author | Erik Andrén <erik.andren@gmail.com> | 2008-12-26 11:58:34 +0100 |
|---|---|---|
| committer | Erik Andrén <erik.andren@gmail.com> | 2008-12-26 11:58:34 +0100 |
| commit | da1d0789d659be9f1d2568351f2b9f3d81345aed (patch) | |
| tree | 71e1067d4024c066f1b7b651205a9cbc222691da /linux/drivers/media/dvb/frontends/cx24123.c | |
| parent | cbd16cf5e7e4aae60ca283ad27bafae1fcb21102 (diff) | |
| parent | ac2c9fd519acfcea10f4b1b17b69e9f3d8f49555 (diff) | |
| download | mediapointer-dvb-s2-da1d0789d659be9f1d2568351f2b9f3d81345aed.tar.gz mediapointer-dvb-s2-da1d0789d659be9f1d2568351f2b9f3d81345aed.tar.bz2 | |
Merge with the main gspca tree.
From: Erik Andrén <erik.andren@gmail.com>
Priority: normal
Signed-off-by: Erik Andrén <erik.andren@gmail.com>
Diffstat (limited to 'linux/drivers/media/dvb/frontends/cx24123.c')
| -rw-r--r-- | linux/drivers/media/dvb/frontends/cx24123.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/linux/drivers/media/dvb/frontends/cx24123.c b/linux/drivers/media/dvb/frontends/cx24123.c index fb559369e..c9cfc8393 100644 --- a/linux/drivers/media/dvb/frontends/cx24123.c +++ b/linux/drivers/media/dvb/frontends/cx24123.c @@ -29,6 +29,7 @@ #include "dvb_frontend.h" #include "cx24123.h" +#include "compat.h" #define XTAL 10111000 @@ -1065,6 +1066,9 @@ static u32 cx24123_tuner_i2c_func(struct i2c_adapter *adapter) static struct i2c_algorithm cx24123_tuner_i2c_algo = { .master_xfer = cx24123_tuner_i2c_tuner_xfer, .functionality = cx24123_tuner_i2c_func, +#ifdef NEED_ALGO_CONTROL + .algo_control = dummy_algo_control, +#endif }; struct i2c_adapter * |