--- margi2/cardbase.h	2001/03/19 23:49:15	1.9
+++ margi2/cardbase.h	2001/03/29 23:12:01	1.10
@@ -40,7 +40,7 @@
 #include <asm/io.h>
 #include <asm/byteorder.h>
 
-
+#ifdef DVB
 #include "dvbdev.h"
 #ifdef __DVB_PACK__
 #include <ost/video.h>
@@ -64,7 +64,8 @@
 
 #include "dvb_demux.h"
 #include "dmxdev.h"
-
+#include "dvb_formats.h"
+#endif
 // List of pci cards in the system
 
 #include "cvdvtypes.h"
@@ -280,8 +281,10 @@ typedef struct dvb_devs_s {
 } dvb_devs_t;
 
 struct cvdv_cards {
+#ifdef DVB
 	struct dvb_device       dvb_dev;
-
+	dvb_demux_t             demux;
+#endif
 	struct cvdv_cards *next;
 	void *margi;
 	struct bus_operations *bus;
@@ -409,6 +412,8 @@ struct cvdv_cards {
 	struct timer_list timer;
 	spinlock_t timelock;
 #endif
+
+#ifdef DVB
         dvb_devs_t *dvb_devs;
         int users[DVB_DEVS_MAX];
         int writers[DVB_DEVS_MAX];
@@ -417,8 +422,12 @@ struct cvdv_cards {
         boolean                 video_blank;
         struct videoStatus      videostate;
         struct audioStatus      audiostate;
-	int dvb_registered;
-
+	int                     dvb_registered;
+	char                    demux_id[16];
+	dmx_frontend_t          mem_frontend;
+	p2p                     tsa;
+	p2p                     tsv;
+#endif
 };
 
 extern u8 FlushPacket[32];