Merge branch 'x86/core' into core/percpu

1 files changed, 22 insertions, 0 deletions

diff --git a/drivers/media/dvb/firewire/Kconfig b/drivers/media/dvb/firewire/Kconfig
new file mode 100644
index 000000000000..69028253e984
--- /dev/null
+++ b/drivers/media/dvb/firewire/Kconfig
@@ -0,0 +1,22 @@
+config DVB_FIREDTV
+        tristate "FireDTV and FloppyDTV"
+        depends on DVB_CORE && IEEE1394
+        help
+          Support for DVB receivers from Digital Everywhere
+          which are connected via IEEE 1394 (FireWire).
+
+          These devices don't have an MPEG decoder built in,
+          so you need an external software decoder to watch TV.
+
+          To compile this driver as a module, say M here:
+          the module will be called firedtv.
+
+if DVB_FIREDTV
+
+config DVB_FIREDTV_IEEE1394
+        def_bool IEEE1394
+
+config DVB_FIREDTV_INPUT
+        def_bool INPUT = y || (INPUT = m && DVB_FIREDTV = m)
+
+endif # DVB_FIREDTV