aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb/ngene/ngene.h
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/dvb/ngene/ngene.h')
-rw-r--r--drivers/media/dvb/ngene/ngene.h29
1 files changed, 0 insertions, 29 deletions
diff --git a/drivers/media/dvb/ngene/ngene.h b/drivers/media/dvb/ngene/ngene.h
index 9b48250fdbf8..74c6dab220a3 100644
--- a/drivers/media/dvb/ngene/ngene.h
+++ b/drivers/media/dvb/ngene/ngene.h
@@ -25,8 +25,6 @@
25#define _NGENE_H_ 25#define _NGENE_H_
26 26
27#define ONE_ADAPTER 27#define ONE_ADAPTER
28#define NGENE_COMMAND_API
29/*#define NGENE_V4L*/
30 28
31#include <linux/types.h> 29#include <linux/types.h>
32#include <linux/sched.h> 30#include <linux/sched.h>
@@ -34,35 +32,14 @@
34#include <linux/i2c.h> 32#include <linux/i2c.h>
35#include <asm/dma.h> 33#include <asm/dma.h>
36#include <asm/scatterlist.h> 34#include <asm/scatterlist.h>
37#include <sound/driver.h>
38#include <sound/core.h>
39#include <sound/initval.h>
40#include <sound/control.h>
41#include <sound/pcm.h>
42#include <sound/pcm_params.h>
43 35
44#include <linux/dvb/frontend.h> 36#include <linux/dvb/frontend.h>
45#include <linux/dvb/ca.h>
46#include <linux/dvb/video.h>
47#include <linux/dvb/audio.h>
48 37
49#include "dmxdev.h" 38#include "dmxdev.h"
50#include "dvbdev.h" 39#include "dvbdev.h"
51#include "dvb_demux.h" 40#include "dvb_demux.h"
52#include "dvb_frontend.h" 41#include "dvb_frontend.h"
53#include "dvb_ringbuffer.h" 42#include "dvb_ringbuffer.h"
54#include "drxd.h"
55#include "drxh.h"
56#include "xc3028.h"
57#include "stb0899.h"
58#include "stv0900.h"
59#include "mt2060.h"
60
61#ifdef NGENE_V4L
62#include <media/v4l2-dev.h>
63#include <media/videobuf-core.h>
64#include <linux/videodev.h>
65#endif
66 43
67#define NGENE_VID 0x18c3 44#define NGENE_VID 0x18c3
68#define NGENE_PID 0x0720 45#define NGENE_PID 0x0720
@@ -675,9 +652,6 @@ struct ngene_channel {
675#ifndef ONE_ADAPTER 652#ifndef ONE_ADAPTER
676 struct dvb_adapter dvb_adapter; 653 struct dvb_adapter dvb_adapter;
677#endif 654#endif
678 struct dvb_device *command_dev;
679 struct dvb_device *audio_dev;
680 struct dvb_device *video_dev;
681 struct tasklet_struct demux_tasklet; 655 struct tasklet_struct demux_tasklet;
682 656
683 struct SBufferHeader *nextBuffer; 657 struct SBufferHeader *nextBuffer;
@@ -715,7 +689,6 @@ struct ngene_channel {
715 struct mychip *mychip; 689 struct mychip *mychip;
716 struct snd_card *soundcard; 690 struct snd_card *soundcard;
717 u8 *evenbuffer; 691 u8 *evenbuffer;
718 u8 *soundbuffer;
719 u8 dma_on; 692 u8 dma_on;
720 int soundstreamon; 693 int soundstreamon;
721 int audiomute; 694 int audiomute;
@@ -887,8 +860,6 @@ struct ngene_info {
887 u8 lnb[4]; 860 u8 lnb[4];
888 int i2c_access; 861 int i2c_access;
889 u8 ntsc; 862 u8 ntsc;
890 u8 exp;
891 u8 exp_init;
892 u8 tsf[4]; 863 u8 tsf[4];
893 u8 i2s[4]; 864 u8 i2s[4];
894 865