diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-19 08:07:53 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-19 08:07:53 -0300 |
| commit | ab912f099d1744b8bf2f7f307f540dfff84bbae4 (patch) | |
| tree | 53c702feb559c6b972fcbad71f3d112360409216 /linux/drivers/media/dvb | |
| parent | b06321e32a39a1462e511309762821ae740914f7 (diff) | |
| parent | 06ef9c25f9cb3d2917bdbec1442d954c77b5e66c (diff) | |
| download | mediapointer-dvb-s2-ab912f099d1744b8bf2f7f307f540dfff84bbae4.tar.gz mediapointer-dvb-s2-ab912f099d1744b8bf2f7f307f540dfff84bbae4.tar.bz2 | |
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/dvb')
| -rw-r--r-- | linux/drivers/media/dvb/frontends/au8522_decoder.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/linux/drivers/media/dvb/frontends/au8522_decoder.c b/linux/drivers/media/dvb/frontends/au8522_decoder.c index 7c782b8d5..70af9cda7 100644 --- a/linux/drivers/media/dvb/frontends/au8522_decoder.c +++ b/linux/drivers/media/dvb/frontends/au8522_decoder.c @@ -48,15 +48,17 @@ MODULE_LICENSE("GPL"); static int au8522_analog_debug; +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 22) static unsigned short normal_i2c[] = { 0x8e >> 1, I2C_CLIENT_END }; +I2C_CLIENT_INSMOD; +#endif + module_param_named(analog_debug, au8522_analog_debug, int, 0644); MODULE_PARM_DESC(analog_debug, "Analog debugging messages [0=Off (default) 1=On]"); -I2C_CLIENT_INSMOD; - struct au8522_register_config { u16 reg_name; u8 reg_val[8]; |