Merge branch 'linus' into sched/urgent

[linux-2.6-omap-h63xx.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 4745a9017a1993476f82e2fae5f6ef049ed5910c..4499ed2ac0ed7339384663dc1b2a5f8f77d82224 100644 (file)
--- a/drivers/media/dvb/bt8xx/dvb-bt8xx.h
+++ b/drivers/media/dvb/bt8xx/dvb-bt8xx.h
@@ -37,8 +37,8 @@
 #include "cx24110.h"
 #include "or51211.h"
 #include "lgdt330x.h"
-#include "lg_h06xf.h"
 #include "zl10353.h"
+#include "tuner-simple.h"
 
 struct dvb_bt8xx_card {
        struct mutex lock;