summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/saa7134
diff options
context:
space:
mode:
authorMichael Krufky <devnull@localhost>2005-09-19 01:20:14 +0000
committerMichael Krufky <devnull@localhost>2005-09-19 01:20:14 +0000
commit1092f381775bd503432c16254be9e5b7b0b8d3ba (patch)
treeabdade528ca0fdb02f17f0fd7198aa1a5f379f61 /linux/drivers/media/video/saa7134
parentf48a4f35f2c3cc912e06a0e8830d3d32c550d7d1 (diff)
downloadmediapointer-dvb-s2-1092f381775bd503432c16254be9e5b7b0b8d3ba.tar.gz
mediapointer-dvb-s2-1092f381775bd503432c16254be9e5b7b0b8d3ba.tar.bz2
* saa6588.c: (saa6588_probe):
- fix build for 2.6.14 * compat.h: * ir-kbd-i2c.c: (ir_probe): * saa7134-i2c.c: * tvaudio.c: (chip_probe): - removed some #if kernel version > 2.6.13 ... using compat.h instead. Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Diffstat (limited to 'linux/drivers/media/video/saa7134')
-rw-r--r--linux/drivers/media/video/saa7134/saa7134-i2c.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-i2c.c b/linux/drivers/media/video/saa7134/saa7134-i2c.c
index a1c9e88dd..a199d7a76 100644
--- a/linux/drivers/media/video/saa7134/saa7134-i2c.c
+++ b/linux/drivers/media/video/saa7134/saa7134-i2c.c
@@ -1,5 +1,5 @@
/*
- * $Id: saa7134-i2c.c,v 1.23 2005/09/13 20:11:39 mkrufky Exp $
+ * $Id: saa7134-i2c.c,v 1.24 2005/09/19 01:20:14 mkrufky Exp $
*
* device driver for philips saa7134 based TV cards
* i2c interface support
@@ -387,11 +387,7 @@ static struct i2c_adapter saa7134_adap_template = {
.class = I2C_CLASS_TV_ANALOG,
#endif
.name = "saa7134",
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13)
.id = I2C_HW_SAA7134,
-#else
- .id = I2C_ALGO_SAA7134,
-#endif
.algo = &saa7134_algo,
.client_register = attach_inform,
};