summaryrefslogtreecommitdiff
path: root/linux/drivers/media/dvb
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-03-30 08:27:06 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-03-30 08:27:06 -0300
commit5a7ad6db3463dcf39be0006b18c45e48acfd7502 (patch)
tree59b6f45f0ff4e5d22dc09dac204fb583a960ce34 /linux/drivers/media/dvb
parent19e35224611a4b1aaf8f5d121233d3c81d920d44 (diff)
parent430e534136bd77613cd4c8dcb8e318b64b4ffaf6 (diff)
downloadmediapointer-dvb-s2-5a7ad6db3463dcf39be0006b18c45e48acfd7502.tar.gz
mediapointer-dvb-s2-5a7ad6db3463dcf39be0006b18c45e48acfd7502.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.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/linux/drivers/media/dvb/frontends/au8522_decoder.c b/linux/drivers/media/dvb/frontends/au8522_decoder.c
index 70af9cda7..326f94d1e 100644
--- a/linux/drivers/media/dvb/frontends/au8522_decoder.c
+++ b/linux/drivers/media/dvb/frontends/au8522_decoder.c
@@ -837,7 +837,6 @@ MODULE_DEVICE_TABLE(i2c, au8522_id);
#endif
static struct v4l2_i2c_driver_data v4l2_i2c_data = {
.name = "au8522",
- .driverid = I2C_DRIVERID_AU8522,
.probe = au8522_probe,
.remove = au8522_remove,
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26)