From: Linus Torvalds Date: Sun, 6 Jan 2019 02:33:21 +0000 (-0800) Subject: Merge tag 'firewire-update' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394... X-Git-Tag: v5.0-rc1~11 X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=commitdiff_plain;h=15b215e5aa29993c1b0f46693a1b482296bcf08e;hp=d7252d0d36375fe8c544098469a21d03fa267a55 Merge tag 'firewire-update' of git://git./linux/kernel/git/ieee1394/linux1394 Pull firewire fixlet from Stefan Richter: "Remove an explicit dependency in Kconfig which is implied by another dependency" * tag 'firewire-update' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394: firewire: Remove depends on HAS_DMA in case of platform dependency --- diff --git a/drivers/firewire/Kconfig b/drivers/firewire/Kconfig index 145974f9662b..4199849e3758 100644 --- a/drivers/firewire/Kconfig +++ b/drivers/firewire/Kconfig @@ -1,5 +1,4 @@ menu "IEEE 1394 (FireWire) support" - depends on HAS_DMA depends on PCI || COMPILE_TEST # firewire-core does not depend on PCI but is # not useful without PCI controller driver