diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-24 03:00:52 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-24 03:00:52 +0300 |
| commit | b3e27d5d4a29bcc8e057b496d5ef5194addaaac0 (patch) | |
| tree | 504c418833b02a8e7d5fb798fe7bdcee82d7f14c /drivers/ntb/hw/Kconfig | |
| parent | cc673757e24d018d64ff8038e28835db1e2902c4 (diff) | |
| parent | 03beaec80d57e7a540b1990188f8a97a076da6de (diff) | |
| download | linux-b3e27d5d4a29bcc8e057b496d5ef5194addaaac0.tar.xz | |
Merge tag 'ntb-4.5' of git://github.com/jonmason/ntb
Pull NTB updates from Jon Mason:
"A new driver to support AMD NTB, a NTB performance test driver, NTB
bugs fixes, and the ability to recover from running out of DMA
descriptors"
* tag 'ntb-4.5' of git://github.com/jonmason/ntb:
NTB: Fix macro parameter conflict with field name
NTB: Add support for AMD PCI-Express Non-Transparent Bridge
ntb: ntb perf tool
NTB: Address out of DMA descriptor issue with NTB
NTB: Clear property bits in BAR value
NTB: ntb_process_tx error path bug
Diffstat (limited to 'drivers/ntb/hw/Kconfig')
| -rw-r--r-- | drivers/ntb/hw/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/ntb/hw/Kconfig b/drivers/ntb/hw/Kconfig index 4d5535c4cddf..7116472b4625 100644 --- a/drivers/ntb/hw/Kconfig +++ b/drivers/ntb/hw/Kconfig @@ -1 +1,2 @@ +source "drivers/ntb/hw/amd/Kconfig" source "drivers/ntb/hw/intel/Kconfig" |