summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/cx23885
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/cx23885
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/cx23885')
-rw-r--r--linux/drivers/media/video/cx23885/cx23885-i2c.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/linux/drivers/media/video/cx23885/cx23885-i2c.c b/linux/drivers/media/video/cx23885/cx23885-i2c.c
index 2e3f3d37c..8823c8781 100644
--- a/linux/drivers/media/video/cx23885/cx23885-i2c.c
+++ b/linux/drivers/media/video/cx23885/cx23885-i2c.c
@@ -287,7 +287,9 @@ static struct i2c_algorithm cx23885_i2c_algo_template = {
static struct i2c_adapter cx23885_i2c_adap_template = {
.name = "cx23885",
.owner = THIS_MODULE,
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31)
.id = I2C_HW_B_CX23885,
+#endif
.algo = &cx23885_i2c_algo_template,
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26)
.class = I2C_CLASS_TV_ANALOG,