]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
fix up a .32 patch
authorGreg Kroah-Hartman <gregkh@suse.de>
Mon, 15 Mar 2010 15:52:41 +0000 (08:52 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Mon, 15 Mar 2010 15:52:41 +0000 (08:52 -0700)
review-2.6.32/v4l-dvb-cxusb-select-all-required-frontend-and-tuner-modules.patch

index 694efc9f52372cc0ed12975c4f46c5ea565b7932..9c5d0ebf9e4b6e4b535bc068759ce2107f5bf82d 100644 (file)
@@ -15,23 +15,18 @@ Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 
 ---
- drivers/media/dvb/dvb-usb/Kconfig |    4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
+ drivers/media/dvb/dvb-usb/Kconfig |    +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 --- a/drivers/media/dvb/dvb-usb/Kconfig
 +++ b/drivers/media/dvb/dvb-usb/Kconfig
-@@ -112,11 +112,13 @@ config DVB_USB_CXUSB
+@@ -112,8 +112,8 @@ 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