diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-08-01 01:38:01 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-08-01 01:38:01 -0300 |
| commit | 0a6ce90779f4a12f8e75009d19209a4ee48707d8 (patch) | |
| tree | 9a8f2fdd6293a1cf8e281789ab3ba7b2f92384b8 /linux/drivers/media/video/pvrusb2 | |
| parent | abed55d1925015d07d0afd92eb50a0b2df2eca27 (diff) | |
| parent | e523ddb42e0588210df880e0e32f0de801803e94 (diff) | |
| download | mediapointer-dvb-s2-0a6ce90779f4a12f8e75009d19209a4ee48707d8.tar.gz mediapointer-dvb-s2-0a6ce90779f4a12f8e75009d19209a4ee48707d8.tar.bz2 | |
merge: http://kernellabs.com/hg/~mkrufky/sms1xxx-unbreak
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/pvrusb2')
| -rw-r--r-- | linux/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c b/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c index 24644fc96..dbc0551f0 100644 --- a/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c +++ b/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c @@ -618,7 +618,9 @@ static struct i2c_algorithm pvr2_i2c_algo_template = { static struct i2c_adapter pvr2_i2c_adap_template = { .owner = THIS_MODULE, .class = 0, +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31) .id = I2C_HW_B_BT848, +#endif }; |