path: root/drivers
diff options
authorLinus Torvalds <torvalds@linux-foundation.org>2014-07-14 17:17:53 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-07-14 17:17:53 -0700
commit1b81e88189446fd6ee21e7e76770154931c5ea60 (patch)
tree9871254c827a064274b5688b928a26529f2da21e /drivers
parent8ec8ba8e7d5b3cdfedf62e46cfa55c8e36172a2d (diff)
parent655fc39bf40331e13503bed85c9ed0278bc35575 (diff)
Merge tag 'firewire-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394
Pull firewire fix from Stefan Richter: "The 1394 drivers cannot and are not supposed to be built on platforms which don't provide the DMA mapping API (regression since v3.16-rc1 with CONFIG_COMPILE_TEST=y on some architectures)" * tag 'firewire-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394: firewire: IEEE 1394 (FireWire) support should depend on HAS_DMA
Diffstat (limited to 'drivers')
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/firewire/Kconfig b/drivers/firewire/Kconfig
index 4199849e3758..145974f9662b 100644
--- a/drivers/firewire/Kconfig
+++ b/drivers/firewire/Kconfig
@@ -1,4 +1,5 @@
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

Privacy Policy