Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (313 commits)
  V4L/DVB (9186): Added support for Prof 7300 DVB-S/S2 cards
  V4L/DVB (9185): S2API: Ensure we have a reasonable ROLLOFF default
  V4L/DVB (9184): cx24116: Change the default SNR units back to percentage by default.
  V4L/DVB (9183): S2API: Return error of the caller provides 0 commands.
  V4L/DVB (9182): S2API: Added support for DTV_HIERARCHY
  V4L/DVB (9181): S2API: Add support fot DTV_GUARD_INTERVAL and DTV_TRANSMISSION_MODE
  V4L/DVB (9180): S2API: Added support for DTV_CODE_RATE_HP/LP
  V4L/DVB (9179): S2API: frontend.h cleanup
  V4L/DVB (9178): cx24116: Add module parameter to return SNR as ESNO.
  V4L/DVB (9177): S2API: Change _8PSK / _16APSK to PSK_8 and APSK_16
  V4L/DVB (9176): Add support for DvbWorld USB cards with STV0288 demodulator.
  V4L/DVB (9175): Remove NULL pointer in stb6000 driver.
  V4L/DVB (9174): Allow custom inittab for ST STV0288 demodulator.
  V4L/DVB (9173): S2API: Remove the hardcoded command limit during validation
  V4L/DVB (9172): S2API: Bugfix related to DVB-S / DVB-S2 tuning for the legacy API.
  V4L/DVB (9171): S2API: Stop an OOPS if illegal commands are dumped in S2API.
  V4L/DVB (9170): cx24116: Sanity checking to data input via S2API to the cx24116 demod.
  V4L/DVB (9169): uvcvideo: Support two new Bison Electronics webcams.
  V4L/DVB (9168): Add support for MSI TV@nywhere Plus remote
  V4L/DVB: v4l2-dev: remove duplicated #include
  ...

1 files changed, 0 insertions, 85 deletions

diff --git a/drivers/media/dvb/cinergyT2/Kconfig b/drivers/media/dvb/cinergyT2/Kconfig
deleted file mode 100644
index c03513b2ccae..000000000000
--- a/drivers/media/dvb/cinergyT2/Kconfig
+++ /dev/null
@@ -1,85 +0,0 @@
-config DVB_CINERGYT2
-        tristate "Terratec CinergyT2/qanu USB2 DVB-T receiver"
-        depends on DVB_CORE && USB && INPUT
-        help
-          Support for "TerraTec CinergyT2" USB2.0 Highspeed DVB Receivers
-
-          Say Y if you own such a device and want to use it.
-
-
-config DVB_CINERGYT2_TUNING
-        bool "sophisticated fine-tuning for CinergyT2 cards"
-        depends on DVB_CINERGYT2
-        help
-          Here you can fine-tune some parameters of the CinergyT2 driver.
-
-          Normally you don't need to touch this, but in exotic setups you
-          may fine-tune your setup and adjust e.g. DMA buffer sizes for
-          a particular application.
-
-
-config DVB_CINERGYT2_STREAM_URB_COUNT
-        int "Number of queued USB Request Blocks for Highspeed Stream Transfers"
-        depends on DVB_CINERGYT2_TUNING
-        default "32"
-        help
-          USB Request Blocks for Highspeed Stream transfers are scheduled in
-          a queue for the Host Controller.
-
-          Usually the default value is a safe choice.
-
-          You may increase this number if you are using this device in a
-          Server Environment with many high-traffic USB Highspeed devices
-          sharing the same USB bus.
-
-
-config DVB_CINERGYT2_STREAM_BUF_SIZE
-        int "Size of URB Stream Buffers for Highspeed Transfers"
-        depends on DVB_CINERGYT2_TUNING
-        default "512"
-        help
-          Should be a multiple of native buffer size of 512 bytes.
-          Default value is a safe choice.
-
-          You may increase this number if you are using this device in a
-          Server Environment with many high-traffic USB Highspeed devices
-          sharing the same USB bus.
-
-
-config DVB_CINERGYT2_QUERY_INTERVAL
-        int "Status update interval [milliseconds]"
-        depends on DVB_CINERGYT2_TUNING
-        default "250"
-        help
-          This is the interval for status readouts from the demodulator.
-          You may try lower values if you need more responsive signal quality
-          measurements.
-
-          Please keep in mind that these updates cause traffic on the tuner
-          control bus and thus may or may not affect reception sensitivity.
-
-          The default value should be a safe choice for common applications.
-
-
-config DVB_CINERGYT2_ENABLE_RC_INPUT_DEVICE
-        bool "Register the onboard IR Remote Control Receiver as Input Device"
-        depends on DVB_CINERGYT2_TUNING
-        default y
-        help
-          Enable this option if you want to use the onboard Infrared Remote
-          Control Receiver as Linux-Input device.
-
-          Right now only the keycode table for the default Remote Control
-          delivered with the device is supported, please see the driver
-          source code to find out how to add support for other controls.
-
-
-config DVB_CINERGYT2_RC_QUERY_INTERVAL
-        int "Infrared Remote Controller update interval [milliseconds]"
-        depends on DVB_CINERGYT2_TUNING && DVB_CINERGYT2_ENABLE_RC_INPUT_DEVICE
-        default "50"
-        help
-          If you have a very fast-repeating remote control you can try lower
-          values, for normal consumer receivers the default value should be
-          a safe choice.
-