diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-04-11 18:33:32 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-04-11 18:33:32 +0200 |
| commit | bac22f74b65e52f4edea9b22087b6206d4a03500 (patch) | |
| tree | 53b1c3bba759bcb78a083ab10fa9aedb63f0eeaf /kernel-x86_64-debug.config | |
| parent | 8f7d01ac1141925e0745baebc8d8b2e843a7938b (diff) | |
| parent | 9f12cede493a51fa8d6915a0b8667f157e4a591b (diff) | |
| download | kernel-4.17.0-0.rc0.git7.1.vanilla.knurd.1.fc26.tar.gz kernel-4.17.0-0.rc0.git7.1.vanilla.knurd.1.fc26.tar.xz kernel-4.17.0-0.rc0.git7.1.vanilla.knurd.1.fc26.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.17.0-0.rc0.git7.1.vanilla.knurd.1.fc29kernel-4.17.0-0.rc0.git7.1.vanilla.knurd.1.fc28kernel-4.17.0-0.rc0.git7.1.vanilla.knurd.1.fc27kernel-4.17.0-0.rc0.git7.1.vanilla.knurd.1.fc26
Diffstat (limited to 'kernel-x86_64-debug.config')
| -rw-r--r-- | kernel-x86_64-debug.config | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config index 29e48db2a..2b2f89ecb 100644 --- a/kernel-x86_64-debug.config +++ b/kernel-x86_64-debug.config @@ -1010,6 +1010,7 @@ CONFIG_CYCLADES=m CONFIG_DA280=m CONFIG_DA311=m CONFIG_DAVICOM_PHY=m +CONFIG_DAX=y CONFIG_DCB=y CONFIG_DCDBAS=m # CONFIG_DDR is not set @@ -1369,6 +1370,7 @@ CONFIG_DVB_USB_V2=m CONFIG_DVB_USB_VP702X=m CONFIG_DVB_USB_VP7045=m CONFIG_DVB_USB_ZD1301=m +# CONFIG_DW_AXI_DMAC is not set # CONFIG_DW_DMAC_BIG_ENDIAN_IO is not set CONFIG_DW_DMAC_CORE=y CONFIG_DW_DMAC=m @@ -3893,6 +3895,7 @@ CONFIG_OCFS2_FS_O2CB=m # CONFIG_OCFS2_FS_STATS is not set CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m # CONFIG_OF is not set +CONFIG_OF_PMEM=y # CONFIG_OMFS_FS is not set CONFIG_OPENVSWITCH_GENEVE=m CONFIG_OPENVSWITCH_GRE=m @@ -4457,6 +4460,7 @@ CONFIG_RTC_DRV_FM3130=m # CONFIG_RTC_DRV_HID_SENSOR_TIME is not set # CONFIG_RTC_DRV_HYM8563 is not set CONFIG_RTC_DRV_ISL12022=m +CONFIG_RTC_DRV_ISL12026=m # CONFIG_RTC_DRV_ISL12057 is not set CONFIG_RTC_DRV_ISL1208=m CONFIG_RTC_DRV_M41T80=m |