From 008766a6e5c531b64dbb45069d1927f57a0e70cd Mon Sep 17 00:00:00 2001
From: Michael Krufky <mkrufky@linuxtv.org>
Date: Tue, 22 Apr 2008 14:46:25 -0300
Subject: [PATCH] --- yaml --- r: 92559 b: refs/heads/master c:
 2c4963d4fb6103c0589db411fccf5e4f8531f173 h: refs/heads/master i:   92557:
 37ca562ce2746e3fe851434473142dfe1e077b12   92555:
 12ac318117fdfac848e3fc754f7e885c14ed6b44   92551:
 06314564789e6dbaac5df78a82d489dcd6b3bad6   92543:
 7f85b0b14332669312cf322c5aaf3d913985d48c v: v3

---
 [refs]                                    | 2 +-
 trunk/drivers/media/dvb/b2c2/Kconfig      | 1 +
 trunk/drivers/media/dvb/bt8xx/Kconfig     | 2 +-
 trunk/drivers/media/dvb/bt8xx/dvb-bt8xx.h | 1 -
 trunk/drivers/media/dvb/dvb-usb/Kconfig   | 1 +
 trunk/drivers/media/video/cx88/Kconfig    | 1 +
 trunk/drivers/media/video/saa7134/Kconfig | 1 +
 7 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index c099959185a0..0acd0e8d64b6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a03402d8ad1638a0a88c5091a189be146c1ee261
+refs/heads/master: 2c4963d4fb6103c0589db411fccf5e4f8531f173
diff --git a/trunk/drivers/media/dvb/b2c2/Kconfig b/trunk/drivers/media/dvb/b2c2/Kconfig
index 3197aeb61d1f..ffcbc7610856 100644
--- a/trunk/drivers/media/dvb/b2c2/Kconfig
+++ b/trunk/drivers/media/dvb/b2c2/Kconfig
@@ -9,6 +9,7 @@ config DVB_B2C2_FLEXCOP
 	select DVB_STV0297 if !DVB_FE_CUSTOMISE
 	select DVB_BCM3510 if !DVB_FE_CUSTOMISE
 	select DVB_LGDT330X if !DVB_FE_CUSTOMISE
+	select TUNER_SIMPLE if !DVB_FE_CUSTOMISE
 	help
 	  Support for the digital TV receiver chip made by B2C2 Inc. included in
 	  Technisats PCI cards and USB boxes.
diff --git a/trunk/drivers/media/dvb/bt8xx/Kconfig b/trunk/drivers/media/dvb/bt8xx/Kconfig
index ea666174e988..902c762e0b7f 100644
--- a/trunk/drivers/media/dvb/bt8xx/Kconfig
+++ b/trunk/drivers/media/dvb/bt8xx/Kconfig
@@ -7,8 +7,8 @@ config DVB_BT8XX
 	select DVB_CX24110 if !DVB_FE_CUSTOMISE
 	select DVB_OR51211 if !DVB_FE_CUSTOMISE
 	select DVB_LGDT330X if !DVB_FE_CUSTOMISE
-	select DVB_PLL if !DVB_FE_CUSTOMISE
 	select DVB_ZL10353 if !DVB_FE_CUSTOMISE
+	select TUNER_SIMPLE if !DVB_FE_CUSTOMISE
 	select FW_LOADER
 	help
 	  Support for PCI cards based on the Bt8xx PCI bridge. Examples are
diff --git a/trunk/drivers/media/dvb/bt8xx/dvb-bt8xx.h b/trunk/drivers/media/dvb/bt8xx/dvb-bt8xx.h
index 25a23c3c7c66..4499ed2ac0ed 100644
--- a/trunk/drivers/media/dvb/bt8xx/dvb-bt8xx.h
+++ b/trunk/drivers/media/dvb/bt8xx/dvb-bt8xx.h
@@ -38,7 +38,6 @@
 #include "or51211.h"
 #include "lgdt330x.h"
 #include "zl10353.h"
-#include "dvb-pll.h"
 #include "tuner-simple.h"
 
 struct dvb_bt8xx_card {
diff --git a/trunk/drivers/media/dvb/dvb-usb/Kconfig b/trunk/drivers/media/dvb/dvb-usb/Kconfig
index d73934dd4c57..3c8493d2026d 100644
--- a/trunk/drivers/media/dvb/dvb-usb/Kconfig
+++ b/trunk/drivers/media/dvb/dvb-usb/Kconfig
@@ -105,6 +105,7 @@ config DVB_USB_CXUSB
 	select DVB_LGDT330X if !DVB_FE_CUSTOMISE
 	select DVB_MT352 if !DVB_FE_CUSTOMISE
 	select DVB_ZL10353 if !DVB_FE_CUSTOMISE
+	select TUNER_SIMPLE if !DVB_FE_CUSTOMISE
 	help
 	  Say Y here to support the Conexant USB2.0 hybrid reference design.
 	  Currently, only DVB and ATSC modes are supported, analog mode
diff --git a/trunk/drivers/media/video/cx88/Kconfig b/trunk/drivers/media/video/cx88/Kconfig
index 49d3813a9b48..bcf6d9ba063d 100644
--- a/trunk/drivers/media/video/cx88/Kconfig
+++ b/trunk/drivers/media/video/cx88/Kconfig
@@ -57,6 +57,7 @@ config VIDEO_CX88_DVB
 	select DVB_NXT200X if !DVB_FE_CUSTOMISE
 	select DVB_CX24123 if !DVB_FE_CUSTOMISE
 	select DVB_ISL6421 if !DVB_FE_CUSTOMISE
+	select TUNER_SIMPLE if !DVB_FE_CUSTOMISE
 	---help---
 	  This adds support for DVB/ATSC cards based on the
 	  Conexant 2388x chip.
diff --git a/trunk/drivers/media/video/saa7134/Kconfig b/trunk/drivers/media/video/saa7134/Kconfig
index 96bc3b1298a2..e086f14d5663 100644
--- a/trunk/drivers/media/video/saa7134/Kconfig
+++ b/trunk/drivers/media/video/saa7134/Kconfig
@@ -37,6 +37,7 @@ config VIDEO_SAA7134_DVB
 	select DVB_TDA826X if !DVB_FE_CUSTOMISE
 	select DVB_TDA827X if !DVB_FE_CUSTOMISE
 	select DVB_ISL6421 if !DVB_FE_CUSTOMISE
+	select TUNER_SIMPLE if !DVB_FE_CUSTOMISE
 	---help---
 	  This adds support for DVB cards based on the
 	  Philips saa7134 chip.