diff options
author | Mark Brown <broonie@kernel.org> | 2015-10-01 01:21:11 +0300 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-10-01 01:21:11 +0300 |
commit | 5c0e869357454c2aab3d02d002ffc1f0a0ab2782 (patch) | |
tree | de3bf0f70d24fc33d791f776513593da5217ea08 /drivers/infiniband/Kconfig | |
parent | baafd373e9287f20ca0c9a6bb38eb6785a146ac2 (diff) | |
parent | ed14ee0eea8b6808025356cecc87a8007885263f (diff) | |
download | linux-5c0e869357454c2aab3d02d002ffc1f0a0ab2782.tar.xz |
Merge tag 'asoc-fix-v4.3-rc2' into asoc-pxa
ASoC: Fixes for v4.3
A disappointingly large set of fixes, though none of them very big and
very widely spread over many different drivers. Nothing especially
stands out, it's mostly all device specific and relatively minor.
Diffstat (limited to 'drivers/infiniband/Kconfig')
-rw-r--r-- | drivers/infiniband/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/infiniband/Kconfig b/drivers/infiniband/Kconfig index da4c6979fbb8..aa26f3c3416b 100644 --- a/drivers/infiniband/Kconfig +++ b/drivers/infiniband/Kconfig @@ -56,7 +56,6 @@ config INFINIBAND_ADDR_TRANS source "drivers/infiniband/hw/mthca/Kconfig" source "drivers/infiniband/hw/qib/Kconfig" -source "drivers/infiniband/hw/ehca/Kconfig" source "drivers/infiniband/hw/cxgb3/Kconfig" source "drivers/infiniband/hw/cxgb4/Kconfig" source "drivers/infiniband/hw/mlx4/Kconfig" |