Merge commit 'v2.6.36-rc1' into HEAD

[karo-tx-linux.git] / drivers / media / dvb / ngene / ngene.h

diff --git a/drivers/media/dvb/ngene/ngene.h b/drivers/media/dvb/ngene/ngene.h
index 676fcbb79026847cfb8694c5d22d25d711195ddd..8fb4200f83f847e73d0f17b6e70e0a33dd107df1 100644 (file)
--- a/drivers/media/dvb/ngene/ngene.h
+++ b/drivers/media/dvb/ngene/ngene.h
@@ -725,6 +725,8 @@ struct ngene {
        u32                   device_version;
        u32                   fw_interface_version;
        u32                   icounts;
+       bool                  msi_enabled;
+       bool                  cmd_timeout_workaround;
 
        u8                   *CmdDoneByte;
        int                   BootFirmware;
@@ -797,6 +799,7 @@ struct ngene_info {
 #define NGENE_VBOX_V2   7
 
        int   fw_version;
+       bool  msi_supported;
        char *name;
 
        int   io_type[MAX_STREAM];