diff options
author | Paul Moore <pmoore@redhat.com> | 2014-03-31 09:49:07 -0400 |
---|---|---|
committer | Paul Moore <pmoore@redhat.com> | 2014-03-31 09:49:07 -0400 |
commit | 6d32c850621b0be75777b9102b14f6268bbd9f0f (patch) | |
tree | fec325f5c1ae763f5eccb3ca1254ab9d9d164b05 /drivers/staging/xillybus/Kconfig | |
parent | selinux: correctly label /proc inodes in use before the policy is loaded (diff) | |
parent | Linux 3.14 (diff) | |
download | linux-dev-6d32c850621b0be75777b9102b14f6268bbd9f0f.tar.xz linux-dev-6d32c850621b0be75777b9102b14f6268bbd9f0f.zip |
Merge tag 'v3.14' into next
Linux 3.14
Diffstat (limited to 'drivers/staging/xillybus/Kconfig')
-rw-r--r-- | drivers/staging/xillybus/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/xillybus/Kconfig b/drivers/staging/xillybus/Kconfig index b15f778b4c68..75c38c8c26eb 100644 --- a/drivers/staging/xillybus/Kconfig +++ b/drivers/staging/xillybus/Kconfig @@ -4,7 +4,7 @@ config XILLYBUS tristate "Xillybus generic FPGA interface" - depends on PCI || (OF_ADDRESS && OF_IRQ) && m + depends on PCI || (OF_ADDRESS && OF_IRQ) help Xillybus is a generic interface for peripherals designed on programmable logic (FPGA). The driver probes the hardware for |