Merge 'drm-3264' branch of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/airlied...

[linux-2.6] / 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 80ef189f930f34cac24662c68b7d7284aaab2466..2923b3b0dd3ce3168d27964d7d78229a80d191fb 100644 (file)
--- a/drivers/media/dvb/bt8xx/dvb-bt8xx.h
+++ b/drivers/media/dvb/bt8xx/dvb-bt8xx.h
@@ -31,7 +31,7 @@
 #include "bttv.h"
 #include "mt352.h"
 #include "sp887x.h"
-#include "dst.h"
+#include "dst_common.h"
 #include "nxt6000.h"
 #include "cx24110.h"
 #include "or51211.h"
@@ -40,7 +40,7 @@ struct dvb_bt8xx_card {
        struct semaphore lock;
        int nfeeds;
        char card_name[32];
-       struct dvb_adapter *dvb_adapter;
+       struct dvb_adapter dvb_adapter;
        struct bt878 *bt;
        unsigned int bttv_nr;
        struct dvb_demux demux;