diff options
| author | Matthias Benesch <twoof7@freenet.de> | 2009-12-23 05:55:02 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-02-26 15:10:54 -0300 |
| commit | cf1b12f2b355a29c44dad426f545db8fa26bd81c (patch) | |
| tree | ba96908a51c907b1a6a9d5ef4cf33c047bacf781 /drivers/media/dvb/ngene/ngene.h | |
| parent | 126cd4bc5fa9cdbedb89bbe7e568140c94900ca7 (diff) | |
| download | op-kernel-dev-cf1b12f2b355a29c44dad426f545db8fa26bd81c.zip op-kernel-dev-cf1b12f2b355a29c44dad426f545db8fa26bd81c.tar.gz | |
V4L/DVB: ngene: Added module parameter "one_adapter"
If parameter "one_adapter" is set, only one adapter per device will be attached.
Otherwise an adapter for every frontend will be attached.
Signed-off-by: Matthias Benesch <twoof7@freenet.de>
Signed-off-by: Oliver Endriss <o.endriss@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/dvb/ngene/ngene.h')
| -rw-r--r-- | drivers/media/dvb/ngene/ngene.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/media/dvb/ngene/ngene.h b/drivers/media/dvb/ngene/ngene.h index 243f86c..15505c2 100644 --- a/drivers/media/dvb/ngene/ngene.h +++ b/drivers/media/dvb/ngene/ngene.h @@ -24,8 +24,6 @@ #ifndef _NGENE_H_ #define _NGENE_H_ -/*#define ONE_ADAPTER*/ - #include <linux/types.h> #include <linux/sched.h> #include <linux/interrupt.h> @@ -649,9 +647,6 @@ struct ngene_channel { struct dmx_frontend mem_frontend; int users; struct video_device *v4l_dev; -#ifndef ONE_ADAPTER - struct dvb_adapter dvb_adapter; -#endif struct tasklet_struct demux_tasklet; struct SBufferHeader *nextBuffer; @@ -728,9 +723,6 @@ struct ngene { struct pci_dev *pci_dev; unsigned char *iomem; -#ifdef ONE_ADAPTER - struct dvb_adapter dvb_adapter; -#endif /*struct i2c_adapter i2c_adapter;*/ u32 device_version; @@ -764,6 +756,7 @@ struct ngene { int i2c_current_bus; spinlock_t cmd_lock; + struct dvb_adapter adapter[MAX_STREAM]; struct ngene_channel channel[MAX_STREAM]; struct ngene_info *card_info; |
