summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/w9968cf.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-08-01 01:38:01 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-08-01 01:38:01 -0300
commit0a6ce90779f4a12f8e75009d19209a4ee48707d8 (patch)
tree9a8f2fdd6293a1cf8e281789ab3ba7b2f92384b8 /linux/drivers/media/video/w9968cf.c
parentabed55d1925015d07d0afd92eb50a0b2df2eca27 (diff)
parente523ddb42e0588210df880e0e32f0de801803e94 (diff)
downloadmediapointer-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/w9968cf.c')
-rw-r--r--linux/drivers/media/video/w9968cf.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/linux/drivers/media/video/w9968cf.c b/linux/drivers/media/video/w9968cf.c
index 86738d186..5324c092a 100644
--- a/linux/drivers/media/video/w9968cf.c
+++ b/linux/drivers/media/video/w9968cf.c
@@ -1508,7 +1508,6 @@ static int w9968cf_i2c_init(struct w9968cf_device* cam)
};
static struct i2c_adapter adap = {
- .id = I2C_HW_SMBUS_W9968CF,
.owner = THIS_MODULE,
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26)
.class = I2C_CLASS_TV_ANALOG,