diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-09-17 18:12:15 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-09-17 18:12:15 +0200 |
| commit | 20afbe1cdd218f149a773c01945893c353fa2c60 (patch) | |
| tree | 0e0526ab848c717a7971728347f62a81d1ca9a1b /kernel-x86_64.config | |
| parent | 93bf93308b5aad49a6575406966b3ab2047e14d3 (diff) | |
| parent | a54055adb14a40ada848c9ef6677cecbc58939e2 (diff) | |
| download | kernel-20afbe1cdd218f149a773c01945893c353fa2c60.tar.gz kernel-20afbe1cdd218f149a773c01945893c353fa2c60.tar.xz kernel-20afbe1cdd218f149a773c01945893c353fa2c60.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.19.0-0.rc4.git0.1.vanilla.knurd.1.fc30kernel-4.19.0-0.rc4.git0.1.vanilla.knurd.1.fc29kernel-4.19.0-0.rc4.git0.1.vanilla.knurd.1.fc28kernel-4.19.0-0.rc4.git0.1.vanilla.knurd.1.fc27
Diffstat (limited to 'kernel-x86_64.config')
| -rw-r--r-- | kernel-x86_64.config | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/kernel-x86_64.config b/kernel-x86_64.config index 279475ec6..2217dbbd3 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -415,7 +415,7 @@ CONFIG_BACKLIGHT_LCD_SUPPORT=y CONFIG_BACKLIGHT_LP855X=m # CONFIG_BACKLIGHT_LV5207LP is not set # CONFIG_BACKLIGHT_PM8941_WLED is not set -# CONFIG_BACKLIGHT_PWM is not set +CONFIG_BACKLIGHT_PWM=m # CONFIG_BACKLIGHT_SAHARA is not set CONFIG_BACKLIGHT_WM831X=m # CONFIG_BACKTRACE_SELF_TEST is not set @@ -1544,6 +1544,7 @@ CONFIG_ENVELOPE_DETECTOR=m CONFIG_EPIC100=m CONFIG_EPOLL=y CONFIG_EQUALIZER=m +# CONFIG_EROFS_FS is not set CONFIG_ET131X=m CONFIG_ETHERNET=y CONFIG_ETHOC=m @@ -6778,6 +6779,7 @@ CONFIG_XEN_PVHVM=y CONFIG_XEN_PVH=y CONFIG_XEN_PV=y CONFIG_XEN_SAVE_RESTORE=y +CONFIG_XEN_SCRUB_PAGES_DEFAULT=y CONFIG_XEN_SCRUB_PAGES=y CONFIG_XEN_SCSI_BACKEND=m CONFIG_XEN_SCSI_FRONTEND=m |