Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6

[sfrench/cifs-2.6.git] / drivers / media / dvb / firewire / Kconfig

diff --git a/drivers/media/dvb/firewire/Kconfig b/drivers/media/dvb/firewire/Kconfig
index 4afa29256df110d3383b6b469762cefbb46436b6..f3e9448c395520eb98847dade512e7b4553c4966 100644 (file)
--- a/drivers/media/dvb/firewire/Kconfig
+++ b/drivers/media/dvb/firewire/Kconfig
@@ -1,6 +1,6 @@
 config DVB_FIREDTV
        tristate "FireDTV and FloppyDTV"
-       depends on DVB_CORE && (FIREWIRE || IEEE1394)
+       depends on DVB_CORE && FIREWIRE
        help
          Support for DVB receivers from Digital Everywhere
          which are connected via IEEE 1394 (FireWire).
@@ -13,12 +13,6 @@ config DVB_FIREDTV
 
 if DVB_FIREDTV
 
-config DVB_FIREDTV_FIREWIRE
-       def_bool FIREWIRE = y || (FIREWIRE = m && DVB_FIREDTV = m)
-
-config DVB_FIREDTV_IEEE1394
-       def_bool IEEE1394 = y || (IEEE1394 = m && DVB_FIREDTV = m)
-
 config DVB_FIREDTV_INPUT
        def_bool INPUT = y || (INPUT = m && DVB_FIREDTV = m)