diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-03-17 07:41:37 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-03-17 07:41:37 +0100 |
| commit | b145538f8257cc9a9b836a18346445bffcfbb09d (patch) | |
| tree | c35a844a5af27360cdbfd42197422e95079093ba /kernel-s390x.config | |
| parent | 9315d6a1050115bd2a7affaa377f58f4df76cfcd (diff) | |
| parent | d91e4865fc4ce45a015d9d69e506db22cab7cda9 (diff) | |
| download | kernel-b145538f8257cc9a9b836a18346445bffcfbb09d.tar.gz kernel-b145538f8257cc9a9b836a18346445bffcfbb09d.tar.xz kernel-b145538f8257cc9a9b836a18346445bffcfbb09d.zip | |
Merge remote-tracking branch 'origin/master'kernel-4.11.0-0.rc2.git3.1.vanilla.knurd.1.fc27kernel-4.11.0-0.rc2.git3.1.vanilla.knurd.1.fc26kernel-4.11.0-0.rc2.git3.1.vanilla.knurd.1.fc25kernel-4.11.0-0.rc2.git3.1.vanilla.knurd.1.fc24
Diffstat (limited to 'kernel-s390x.config')
| -rw-r--r-- | kernel-s390x.config | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel-s390x.config b/kernel-s390x.config index d234f2a88..9fb8cd500 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -602,6 +602,7 @@ CONFIG_CEPH_LIB=m # CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set CONFIG_CFAG12864B=m CONFIG_CFAG12864B_RATE=20 +CONFIG_CFG80211_CRDA_SUPPORT=y CONFIG_CFG80211_DEBUGFS=y CONFIG_CFG80211_DEFAULT_PS=y # CONFIG_CFG80211_DEVELOPER_WARNINGS is not set @@ -2403,6 +2404,8 @@ CONFIG_LOOPBACK_TARGET=m # CONFIG_LPC_ICH is not set CONFIG_LP_CONSOLE=y # CONFIG_LPC_SCH is not set +CONFIG_LPFC_NVME_INITIATOR=y +CONFIG_LPFC_NVME_TARGET=y CONFIG_LSI_ET1011C_PHY=m CONFIG_LSM_MMAP_MIN_ADDR=65536 # CONFIG_LTC2485 is not set |