Commit 15b215e5 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'firewire-update' of git://git.kernel.org/pub/scm/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
parents d7252d0d c820518f
menu "IEEE 1394 (FireWire) support" menu "IEEE 1394 (FireWire) support"
depends on HAS_DMA
depends on PCI || COMPILE_TEST depends on PCI || COMPILE_TEST
# firewire-core does not depend on PCI but is # firewire-core does not depend on PCI but is
# not useful without PCI controller driver # not useful without PCI controller driver
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment