diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2015-09-09 13:22:00 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2015-09-09 13:22:00 -0400 |
| commit | a2e69cf2ffb177432d580294e2de97520c981442 (patch) | |
| tree | 45ff36c350b0982403577396b5d4580ad7e73e73 /config-generic | |
| parent | c0b6978b16a63ac157a2189576452e765ec95798 (diff) | |
| download | kernel-a2e69cf2ffb177432d580294e2de97520c981442.tar.gz kernel-a2e69cf2ffb177432d580294e2de97520c981442.tar.xz kernel-a2e69cf2ffb177432d580294e2de97520c981442.zip | |
Linux v4.2-10774-g26d2177e977c
Diffstat (limited to 'config-generic')
| -rw-r--r-- | config-generic | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/config-generic b/config-generic index 0eb1eca9a..0e80d631a 100644 --- a/config-generic +++ b/config-generic @@ -177,10 +177,12 @@ CONFIG_INFINIBAND_SRPT=m CONFIG_INFINIBAND_USER_MAD=m CONFIG_INFINIBAND_USER_ACCESS=m CONFIG_INFINIBAND_ON_DEMAND_PAGING=y -CONFIG_INFINIBAND_IPATH=m +# Deprecated and moved to staging +# CONFIG_INFINIBAND_IPATH is not set CONFIG_INFINIBAND_ISER=m CONFIG_INFINIBAND_ISERT=m -CONFIG_INFINIBAND_AMSO1100=m +# Deprecated and moved to staging +# CONFIG_INFINIBAND_AMSO1100 is not set # CONFIG_INFINIBAND_AMSO1100_DEBUG is not set CONFIG_INFINIBAND_CXGB3=m CONFIG_INFINIBAND_CXGB4=m @@ -5462,6 +5464,7 @@ CONFIG_USBIP_HOST=m # CONFIG_FB_SM7XX is not set # CONFIG_FB_TFT is not set # CONFIG_FB_SM750 is not set +# CONFIG_STAGING_RDMA is not set # END OF STAGING # |