Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

[sfrench/cifs-2.6.git] / drivers / media / dvb / bt8xx / dst_common.h

diff --git a/drivers/media/dvb/bt8xx/dst_common.h b/drivers/media/dvb/bt8xx/dst_common.h
index 3281a6ca3685d46ea19ec12d9e88133ca228c6f8..51d4e043716c19f37899566ee0f3bf97539fb685 100644 (file)
--- a/drivers/media/dvb/bt8xx/dst_common.h
+++ b/drivers/media/dvb/bt8xx/dst_common.h
@@ -22,8 +22,10 @@
 #ifndef DST_COMMON_H
 #define DST_COMMON_H
 
+#include <linux/smp_lock.h>
 #include <linux/dvb/frontend.h>
 #include <linux/device.h>
+#include <linux/mutex.h>
 #include "bt878.h"
 
 #include "dst_ca.h"
@@ -49,6 +51,7 @@
 #define DST_TYPE_HAS_FW_BUILD  64
 #define DST_TYPE_HAS_OBS_REGS  128
 #define DST_TYPE_HAS_INC_COUNT 256
+#define DST_TYPE_HAS_MULTI_FE  512
 
 /*     Card capability list    */
 
@@ -117,6 +120,9 @@ struct dst_state {
        u8 fw_version[8];
        u8 card_info[8];
        u8 vendor[8];
+       u8 board_info[8];
+
+       struct mutex dst_mutex;
 };
 
 struct dst_types {