diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-08 07:25:08 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-08 07:25:08 -0300 |
| commit | c13f70467621e2c352f93b336b382e70ea24d218 (patch) | |
| tree | 582367340fe7529eb3fec3c514ec9d4b2f68ff71 /linux/drivers/media/video/cx88/cx88-vp3054-i2c.c | |
| parent | a953cf4edb8db13f8b7d20c793696a13ffcd3333 (diff) | |
| parent | 9380e197397e3f8404fa2d2effe5c84b6f56735b (diff) | |
| download | mediapointer-dvb-s2-c13f70467621e2c352f93b336b382e70ea24d218.tar.gz mediapointer-dvb-s2-c13f70467621e2c352f93b336b382e70ea24d218.tar.bz2 | |
merge: http://linuxtv.org/hg/~jfrancois/gspca/
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/cx88/cx88-vp3054-i2c.c')
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-vp3054-i2c.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-vp3054-i2c.c b/linux/drivers/media/video/cx88/cx88-vp3054-i2c.c index 84bb59175..20800425c 100644 --- a/linux/drivers/media/video/cx88/cx88-vp3054-i2c.c +++ b/linux/drivers/media/video/cx88/cx88-vp3054-i2c.c @@ -30,10 +30,6 @@ #include "cx88.h" #include "cx88-vp3054-i2c.h" -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0) -#include "i2c-compat.h" -#endif - MODULE_DESCRIPTION("driver for cx2388x VP3054 design"); MODULE_AUTHOR("Chris Pascoe <c.pascoe@itee.uq.edu.au>"); MODULE_LICENSE("GPL"); @@ -124,18 +120,12 @@ int vp3054_i2c_probe(struct cx8802_dev *dev) memcpy(&vp3054_i2c->algo, &vp3054_i2c_algo_template, sizeof(vp3054_i2c->algo)); -#ifdef I2C_CLASS_TV_DIGITAL vp3054_i2c->adap.class |= I2C_CLASS_TV_DIGITAL; -#endif -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,66) vp3054_i2c->adap.dev.parent = &dev->pci->dev; -#endif strlcpy(vp3054_i2c->adap.name, core->name, sizeof(vp3054_i2c->adap.name)); -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) vp3054_i2c->adap.owner = THIS_MODULE; -#endif vp3054_i2c->adap.id = I2C_HW_B_CX2388x; vp3054_i2c->algo.data = dev; i2c_set_adapdata(&vp3054_i2c->adap, dev); |