From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 15 Jul 2014 00:17:53 +0000 (-0700)
Subject: Merge tag 'firewire-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394... 
X-Git-Tag: firefly_0821_release~176^2~3615
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=1b81e88189446fd6ee21e7e76770154931c5ea60;p=firefly-linux-kernel-4.4.55.git

Merge tag 'firewire-fix' of git://git./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
---

1b81e88189446fd6ee21e7e76770154931c5ea60