diff options
author | Mauro Carvalho Chehab <devnull@localhost> | 2005-07-03 13:41:38 +0000 |
---|---|---|
committer | Mauro Carvalho Chehab <devnull@localhost> | 2005-07-03 13:41:38 +0000 |
commit | 77bd3f4b79844adf564a9a7ab09c89e44ac8d929 (patch) | |
tree | 785ca57d1e003b51502ac5e385df46d7b0414ceb /linux/drivers/media/video/cx88/cx88-video.c | |
parent | baa52f41b316708d50ad39912800718637f7cef2 (diff) | |
download | mediapointer-dvb-s2-77bd3f4b79844adf564a9a7ab09c89e44ac8d929.tar.gz mediapointer-dvb-s2-77bd3f4b79844adf564a9a7ab09c89e44ac8d929.tar.bz2 |
* bttv-i2c.c, cx88-i2c.c, saa7134-i2c.c:
- I2C cleanups. Now, all drivers uses the same basic structure.
* cx88-video.c:
- Duplicated code commented. Should be removed soon.
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Diffstat (limited to 'linux/drivers/media/video/cx88/cx88-video.c')
-rw-r--r-- | linux/drivers/media/video/cx88/cx88-video.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-video.c b/linux/drivers/media/video/cx88/cx88-video.c index 38609f609..5110ac203 100644 --- a/linux/drivers/media/video/cx88/cx88-video.c +++ b/linux/drivers/media/video/cx88/cx88-video.c @@ -1,5 +1,5 @@ /* - * $Id: cx88-video.c,v 1.73 2005/07/02 15:24:11 nsh Exp $ + * $Id: cx88-video.c,v 1.74 2005/07/03 13:41:38 mchehab Exp $ * * device driver for Conexant 2388x based TV cards * video4linux video interface @@ -2020,7 +2020,9 @@ static int __devinit cx8800_initdev(struct pci_dev *pci_dev, { struct cx8800_dev *dev; struct cx88_core *core; +#if 0 struct tuner_addr tun_addr; +#endif int err; dev = kmalloc(sizeof(*dev),GFP_KERNEL); @@ -2094,6 +2096,7 @@ static int __devinit cx8800_initdev(struct pci_dev *pci_dev, request_module("tuner"); if (core->tda9887_conf) request_module("tda9887"); +#if 0 /* cx88-i2c has already this function */ if (core->radio_type != UNSET) { tun_addr.state = T_RADIO; tun_addr.type = core->radio_type; @@ -2111,7 +2114,7 @@ static int __devinit cx8800_initdev(struct pci_dev *pci_dev, if (core->tda9887_conf) cx88_call_i2c_clients(dev->core,TDA9887_SET_CONFIG,&core->tda9887_conf); - +#endif /* register v4l devices */ dev->video_dev = cx88_vdev_init(core,dev->pci, &cx8800_video_template,"video"); |