summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/tvmixer.c
diff options
context:
space:
mode:
authorJean-Francois Moine <moinejf@free.fr>2009-02-01 17:46:28 +0100
committerJean-Francois Moine <moinejf@free.fr>2009-02-01 17:46:28 +0100
commitad4f519e3cf44cffa54140b1b211078a171633f6 (patch)
treea18b013ce9a8f216ad9ab5ad6168ef70eada2244 /linux/drivers/media/video/tvmixer.c
parent173b6c4977dc5d99c1273fe0e139dc6d5d6f7d6e (diff)
parent40db5f952453121ccdf3ad610cb209984df4b1c0 (diff)
downloadmediapointer-dvb-s2-ad4f519e3cf44cffa54140b1b211078a171633f6.tar.gz
mediapointer-dvb-s2-ad4f519e3cf44cffa54140b1b211078a171633f6.tar.bz2
merge: v4l-dvb
Diffstat (limited to 'linux/drivers/media/video/tvmixer.c')
-rw-r--r--linux/drivers/media/video/tvmixer.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/linux/drivers/media/video/tvmixer.c b/linux/drivers/media/video/tvmixer.c
index fd2e902ea..ae25f0d16 100644
--- a/linux/drivers/media/video/tvmixer.c
+++ b/linux/drivers/media/video/tvmixer.c
@@ -223,7 +223,6 @@ static struct i2c_driver driver = {
.driver = {
.name = "tvmixer",
},
- .id = I2C_DRIVERID_TVMIXER,
#ifndef I2C_DF_DUMMY
.detach_adapter = tvmixer_adapters,
#endif