diff options
| author | Jani Nikula <jani.nikula@intel.com> | 2020-06-25 18:05:03 +0300 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2020-06-25 18:05:03 +0300 |
| commit | 0f69403d2535ffc7200a8414cf3ca66a49b0d741 (patch) | |
| tree | 3ce85dd08359ea872aa8fb9bd12072efdb80a787 /drivers/media/firewire/Kconfig | |
| parent | 580fbdc5136822208f107500682e50a1cb232e94 (diff) | |
| parent | 0a19b068acc47d05212f03e494381926dc0381e2 (diff) | |
| download | linux-0f69403d2535ffc7200a8414cf3ca66a49b0d741.tar.xz | |
Merge drm/drm-next into drm-intel-next-queued
Catch up with upstream, in particular to get c1e8d7c6a7a6 ("mmap locking
API: convert mmap_sem comments").
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'drivers/media/firewire/Kconfig')
| -rw-r--r-- | drivers/media/firewire/Kconfig | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/media/firewire/Kconfig b/drivers/media/firewire/Kconfig index e7837da5905b..0c1f326f581f 100644 --- a/drivers/media/firewire/Kconfig +++ b/drivers/media/firewire/Kconfig @@ -1,7 +1,9 @@ # SPDX-License-Identifier: GPL-2.0-only +if DVB_CORE && FIREWIRE +comment "FireWire (IEEE 1394) Adapters" + config DVB_FIREDTV tristate "FireDTV and FloppyDTV" - depends on DVB_CORE && FIREWIRE help Support for DVB receivers from Digital Everywhere which are connected via IEEE 1394 (FireWire). @@ -18,3 +20,4 @@ config DVB_FIREDTV_INPUT def_bool INPUT = y || (INPUT = m && DVB_FIREDTV = m) endif # DVB_FIREDTV +endif # DVB_CORE && FIREWIRE |