[kernel] r15192 - in dists/trunk/linux-2.6/debian/patches: bugfix/all series

[Ben Hutchings]

Author: benh
Date: Thu Feb 18 14:10:37 2010
New Revision: 15192

Log:
Update cxusb Kconfig selection fixes for 2.6.33

Added:
   dists/trunk/linux-2.6/debian/patches/bugfix/all/cxusb-Select-all-required-frontend-and-tuner-modules.patch
Deleted:
   dists/trunk/linux-2.6/debian/patches/bugfix/all/cxusb-dont-select-lgs8gl5.patch
   dists/trunk/linux-2.6/debian/patches/bugfix/all/cxusb-select-lgs8gxx.patch
Modified:
   dists/trunk/linux-2.6/debian/patches/series/base

Added: dists/trunk/linux-2.6/debian/patches/bugfix/all/cxusb-Select-all-required-frontend-and-tuner-modules.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/all/cxusb-Select-all-required-frontend-and-tuner-modules.patch	Thu Feb 18 14:10:37 2010	(r15192)
@@ -0,0 +1,35 @@
+Subject: [PATCH] cxusb: Select all required frontend and tuner modules
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Thu, 11 Feb 2010 02:57:18 +0000
+
+cxusb uses the atbm8830 and lgs8gxx (not lgs8gl5) frontends and the
+max2165 tuner, so it needs to select them.
+
+Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+Cc: stable at kernel.org
+---
+ drivers/media/dvb/dvb-usb/Kconfig |    4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+diff --git a/drivers/media/dvb/dvb-usb/Kconfig b/drivers/media/dvb/dvb-usb/Kconfig
+index 1b24989..465295b 100644
+--- a/drivers/media/dvb/dvb-usb/Kconfig
++++ b/drivers/media/dvb/dvb-usb/Kconfig
+@@ -112,11 +112,13 @@ config DVB_USB_CXUSB
+ 	select DVB_MT352 if !DVB_FE_CUSTOMISE
+ 	select DVB_ZL10353 if !DVB_FE_CUSTOMISE
+ 	select DVB_DIB7000P if !DVB_FE_CUSTOMISE
+-	select DVB_LGS8GL5 if !DVB_FE_CUSTOMISE
+ 	select DVB_TUNER_DIB0070 if !DVB_FE_CUSTOMISE
++	select DVB_ATBM8830 if !DVB_FE_CUSTOMISE
++	select DVB_LGS8GXX if !DVB_FE_CUSTOMISE
+ 	select MEDIA_TUNER_SIMPLE if !MEDIA_TUNER_CUSTOMISE
+ 	select MEDIA_TUNER_XC2028 if !MEDIA_TUNER_CUSTOMISE
+ 	select MEDIA_TUNER_MXL5005S if !MEDIA_TUNER_CUSTOMISE
++	select MEDIA_TUNER_MAX2165 if !MEDIA_TUNER_CUSTOMISE
+ 	help
+ 	  Say Y here to support the Conexant USB2.0 hybrid reference design.
+ 	  Currently, only DVB and ATSC modes are supported, analog mode
+-- 
+1.6.6
+

Modified: dists/trunk/linux-2.6/debian/patches/series/base
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/base	Thu Feb 18 14:03:40 2010	(r15191)
+++ dists/trunk/linux-2.6/debian/patches/series/base	Thu Feb 18 14:10:37 2010	(r15192)
@@ -61,8 +61,8 @@
 #+ features/all/rt3090sta-use-request_firmware.patch
 #+ features/all/input-alps-add-support-for-touchpads-with-4-directional-button-2.patch
 
++ bugfix/all/cxusb-Select-all-required-frontend-and-tuner-modules.patch
 
-+ bugfix/all/cxusb-select-lgs8gxx.patch
 # FIXME:
 #+ bugfix/x86/kvm-pit-control-word-is-write-only.patch
 #+ bugfix/x86/kvm-fix-memory-access-during-x86-emulation.patch
@@ -70,7 +70,5 @@
 #+ bugfix/x86/kvm-Fix-popf-emulation.patch
 #+ bugfix/x86/kvm-Check-CPL-level-during-privilege-instruction-emulation.patch
 
-
-+ bugfix/all/cxusb-dont-select-lgs8gl5.patch
 + debian/sysrq-mask.patch
 + bugfix/all/efifb_fix_v2.patch