add real 2.6.32.10

allmost identical to rc1 ;-)

svn path=/dists/sid/linux-2.6/; revision=15386
This commit is contained in:
Maximilian Attems 2010-03-16 00:20:58 +00:00
parent f85c9f45e3
commit 75be4423b4
2 changed files with 3 additions and 8 deletions

2
debian/changelog vendored
View File

@ -2,7 +2,7 @@ linux-2.6 (2.6.32-10) UNRELEASED; urgency=low
[ maximilian attems] [ maximilian attems]
* tcp: fix ICMP-RTO war. * tcp: fix ICMP-RTO war.
* Add stable 2.6.32.10-rc1. * Add stable 2.6.32.10.
- net/via-rhine: Fix scheduling while atomic bugs (closes: #549606) - net/via-rhine: Fix scheduling while atomic bugs (closes: #549606)
- HID: remove TENX iBuddy from blacklist (Closes: #551312) - HID: remove TENX iBuddy from blacklist (Closes: #551312)
- USB: SIS USB2VGA DRIVER: support KAIREN's USB VGA adaptor - USB: SIS USB2VGA DRIVER: support KAIREN's USB VGA adaptor

View File

@ -2213,24 +2213,19 @@ index 0241a7c..dddfc46 100644
} }
diff --git a/drivers/media/dvb/dvb-usb/Kconfig b/drivers/media/dvb/dvb-usb/Kconfig diff --git a/drivers/media/dvb/dvb-usb/Kconfig b/drivers/media/dvb/dvb-usb/Kconfig
index 0e4b97f..1a1d8d3 100644 index 0e4b97f..690823f 100644
--- a/drivers/media/dvb/dvb-usb/Kconfig --- a/drivers/media/dvb/dvb-usb/Kconfig
+++ b/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_MT352 if !DVB_FE_CUSTOMISE
select DVB_ZL10353 if !DVB_FE_CUSTOMISE select DVB_ZL10353 if !DVB_FE_CUSTOMISE
select DVB_DIB7000P if !DVB_FE_CUSTOMISE select DVB_DIB7000P if !DVB_FE_CUSTOMISE
- select DVB_LGS8GL5 if !DVB_FE_CUSTOMISE - select DVB_LGS8GL5 if !DVB_FE_CUSTOMISE
select DVB_TUNER_DIB0070 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 DVB_LGS8GXX if !DVB_FE_CUSTOMISE
select MEDIA_TUNER_SIMPLE if !MEDIA_TUNER_CUSTOMISE select MEDIA_TUNER_SIMPLE if !MEDIA_TUNER_CUSTOMISE
select MEDIA_TUNER_XC2028 if !MEDIA_TUNER_CUSTOMISE select MEDIA_TUNER_XC2028 if !MEDIA_TUNER_CUSTOMISE
select MEDIA_TUNER_MXL5005S 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
diff --git a/drivers/media/dvb/frontends/l64781.c b/drivers/media/dvb/frontends/l64781.c diff --git a/drivers/media/dvb/frontends/l64781.c b/drivers/media/dvb/frontends/l64781.c
index 3051b64..445fa10 100644 index 3051b64..445fa10 100644
--- a/drivers/media/dvb/frontends/l64781.c --- a/drivers/media/dvb/frontends/l64781.c