diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2008-07-17 23:50:58 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-20 06:17:52 -0400 |
commit | f87086e302300fdff1bd32049deb7a7f3e3de7da (patch) | |
tree | 27b42587cf577a63d9f79ccb27267e0dea7188cb /drivers/media/video/usbvision/usbvision-i2c.c | |
parent | e01117c81676dc9897f567e32cdc13a26e85280b (diff) |
v4l-dvb: remove legacy checks to allow support for kernels < 2.6.10
Also remove some blank lines that were used to split compat code at -devel
tree.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/usbvision/usbvision-i2c.c')
-rw-r--r-- | drivers/media/video/usbvision/usbvision-i2c.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/media/video/usbvision/usbvision-i2c.c b/drivers/media/video/usbvision/usbvision-i2c.c index e2274d77ea29..a6d00858b07e 100644 --- a/drivers/media/video/usbvision/usbvision-i2c.c +++ b/drivers/media/video/usbvision/usbvision-i2c.c | |||
@@ -190,7 +190,6 @@ static u32 functionality(struct i2c_adapter *adap) | |||
190 | return I2C_FUNC_SMBUS_EMUL | I2C_FUNC_10BIT_ADDR; | 190 | return I2C_FUNC_SMBUS_EMUL | I2C_FUNC_10BIT_ADDR; |
191 | } | 191 | } |
192 | 192 | ||
193 | |||
194 | /* -----exported algorithm data: ------------------------------------- */ | 193 | /* -----exported algorithm data: ------------------------------------- */ |
195 | 194 | ||
196 | static struct i2c_algorithm usbvision_algo = { | 195 | static struct i2c_algorithm usbvision_algo = { |
@@ -514,11 +513,7 @@ static struct i2c_adapter i2c_adap_template = { | |||
514 | .id = I2C_HW_B_BT848, /* FIXME */ | 513 | .id = I2C_HW_B_BT848, /* FIXME */ |
515 | .client_register = attach_inform, | 514 | .client_register = attach_inform, |
516 | .client_unregister = detach_inform, | 515 | .client_unregister = detach_inform, |
517 | #ifdef I2C_ADAP_CLASS_TV_ANALOG | ||
518 | .class = I2C_ADAP_CLASS_TV_ANALOG, | ||
519 | #else | ||
520 | .class = I2C_CLASS_TV_ANALOG, | 516 | .class = I2C_CLASS_TV_ANALOG, |
521 | #endif | ||
522 | }; | 517 | }; |
523 | 518 | ||
524 | static struct i2c_client i2c_client_template = { | 519 | static struct i2c_client i2c_client_template = { |