diff --git a/[refs] b/[refs] index e85b191fd4d3..c988e34802f6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 69abe02e785f29b52658b74c8084f8d9f4432f19 +refs/heads/master: 115ad55e9c10bad551357a4f4d43d57aaa776bf0 diff --git a/trunk/drivers/media/dvb/dvb-usb-v2/Kconfig b/trunk/drivers/media/dvb/dvb-usb-v2/Kconfig index 81f0f1c03c1c..98b8fb59cd28 100644 --- a/trunk/drivers/media/dvb/dvb-usb-v2/Kconfig +++ b/trunk/drivers/media/dvb/dvb-usb-v2/Kconfig @@ -16,14 +16,6 @@ config DVB_USB_V2 config DVB_USB_CYPRESS_FIRMWARE tristate "Cypress firmware helper routines" depends on DVB_USB_V2 - help - Common firmware download routine for various Cypress USB interface - chips. - - Supported models are: - Cypress AN2135 - Cypress AN2235 - Cypress FX2 config DVB_USB_AF9015 tristate "Afatech AF9015 DVB-T USB2.0 support"