Auto merge with /home/aegl/GIT/linus

1 files changed, 16 insertions, 0 deletions

diff --git a/drivers/media/dvb/pluto2/Kconfig b/drivers/media/dvb/pluto2/Kconfig
new file mode 100644
index 000000000000..f02842be0d60
--- /dev/null
+++ b/drivers/media/dvb/pluto2/Kconfig
@@ -0,0 +1,16 @@
+config DVB_PLUTO2
+        tristate "Pluto2 cards"
+        depends on DVB_CORE && PCI
+        select I2C
+        select I2C_ALGOBIT
+        select DVB_TDA1004X
+        help
+          Support for PCI cards based on the Pluto2 FPGA like the Satelco
+          Easywatch Mobile Terrestrial DVB-T Receiver.
+
+          Since these cards have no MPEG decoder onboard, they transmit
+          only compressed MPEG data over the PCI bus, so you need
+          an external software decoder to watch TV on your computer.
+
+          Say Y or M if you own such a device and want to use it.
+