git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
drivers
/
media
/
dvb
/
bt8xx
/
dvb-bt8xx.h
diff --git
a/drivers/media/dvb/bt8xx/dvb-bt8xx.h
b/drivers/media/dvb/bt8xx/dvb-bt8xx.h
index
969606e
..
5fb87df
100644
(file)
--- a/
drivers/media/dvb/bt8xx/dvb-bt8xx.h
+++ b/
drivers/media/dvb/bt8xx/dvb-bt8xx.h
@@
-22,14
+22,22
@@
*
*/
*
*/
+#ifndef DVB_BT8XX_H
+#define DVB_BT8XX_H
+
#include <linux/i2c.h>
#include "dvbdev.h"
#include "dvb_net.h"
#include <linux/i2c.h>
#include "dvbdev.h"
#include "dvb_net.h"
+#include "bttv.h"
+#include "mt352.h"
+#include "sp887x.h"
+#include "dst.h"
+#include "nxt6000.h"
+#include "cx24110.h"
struct dvb_bt8xx_card {
struct dvb_bt8xx_card {
-
- struct list_head list;
- u8 active;
+ struct semaphore lock;
+ int nfeeds;
char card_name[32];
struct dvb_adapter *dvb_adapter;
struct bt878 *bt;
char card_name[32];
struct dvb_adapter *dvb_adapter;
struct bt878 *bt;
@@
-44,4
+52,7
@@
struct dvb_bt8xx_card {
struct i2c_adapter *i2c_adapter;
struct dvb_net dvbnet;
struct i2c_adapter *i2c_adapter;
struct dvb_net dvbnet;
+ struct dvb_frontend* fe;
};
};
+
+#endif /* DVB_BT8XX_H */