summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/cx18
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-06-19 19:56:56 +0000
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-06-19 19:56:56 +0000
commitf47aedd6b5ff27a36bee52be6cd41b022375b133 (patch)
treee6fb81caa7941d0df5a9845270e9189e16733d7b /linux/drivers/media/video/cx18
parentbce52916562346cea9474564c12897c762d87e46 (diff)
downloadmediapointer-dvb-s2-f47aedd6b5ff27a36bee52be6cd41b022375b133.tar.gz
mediapointer-dvb-s2-f47aedd6b5ff27a36bee52be6cd41b022375b133.tar.bz2
Stop defining I2C adapter IDs nobody uses
From: Jean Delvare <khali@linux-fr.org> There is no point in defining I2C adapter IDs when no code is using them. As this field might go away in the future, stop using it when we don't need to. Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/cx18')
-rw-r--r--linux/drivers/media/video/cx18/cx18-i2c.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/linux/drivers/media/video/cx18/cx18-i2c.c b/linux/drivers/media/video/cx18/cx18-i2c.c
index 3c76a1e27..cee650c58 100644
--- a/linux/drivers/media/video/cx18/cx18-i2c.c
+++ b/linux/drivers/media/video/cx18/cx18-i2c.c
@@ -190,7 +190,9 @@ static int cx18_getsda(void *data)
/* template for i2c-bit-algo */
static struct i2c_adapter cx18_i2c_adap_template = {
.name = "cx18 i2c driver",
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31)
.id = I2C_HW_B_CX2341X,
+#endif
.algo = NULL, /* set by i2c-algo-bit */
.algo_data = NULL, /* filled from template */
.owner = THIS_MODULE,