summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/saa5246a.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-02-01 11:40:27 -0200
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-02-01 11:40:27 -0200
commit40db5f952453121ccdf3ad610cb209984df4b1c0 (patch)
tree8dae68b23f086de70c0a8b79dcb3f24dd6492159 /linux/drivers/media/video/saa5246a.c
parentfd237d0264b616b7a22369b14e56952e2bc306c5 (diff)
parent9fdaf8936ef6a151aed8baf835bf98716e2b33bf (diff)
downloadmediapointer-dvb-s2-40db5f952453121ccdf3ad610cb209984df4b1c0.tar.gz
mediapointer-dvb-s2-40db5f952453121ccdf3ad610cb209984df4b1c0.tar.bz2
merge: http://linuxtv.org/hg/~mkrufky/fixes
From: Mauro Carvalho Chehab <mchehab@redhat.com> Priority: normal Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/saa5246a.c')
-rw-r--r--linux/drivers/media/video/saa5246a.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/linux/drivers/media/video/saa5246a.c b/linux/drivers/media/video/saa5246a.c
index cb8a92e5f..be23b5bd5 100644
--- a/linux/drivers/media/video/saa5246a.c
+++ b/linux/drivers/media/video/saa5246a.c
@@ -1101,7 +1101,6 @@ MODULE_DEVICE_TABLE(i2c, saa5246a_id);
static struct v4l2_i2c_driver_data v4l2_i2c_data = {
.name = "saa5246a",
- .driverid = I2C_DRIVERID_SAA5249,
.probe = saa5246a_probe,
.remove = saa5246a_remove,
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26)