diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-09-18 21:34:40 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-09-18 21:34:40 +0200 |
| commit | b737f8fbced0744768781c824f00fd24b04493b3 (patch) | |
| tree | eca8baad1d257df6de3730a7423c603b91bb4fd9 /kernel-ppc64.config | |
| parent | 182788c229eda16cd3c3747ff22594901adfeabc (diff) | |
| parent | 3b45a5aa5eef29f0aa191cdcd38112e69120245e (diff) | |
| download | kernel-b737f8fbced0744768781c824f00fd24b04493b3.tar.gz kernel-b737f8fbced0744768781c824f00fd24b04493b3.tar.xz kernel-b737f8fbced0744768781c824f00fd24b04493b3.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.14.0-0.rc1.git0.1.vanilla.knurd.1.fc28kernel-4.14.0-0.rc1.git0.1.vanilla.knurd.1.fc27kernel-4.14.0-0.rc1.git0.1.vanilla.knurd.1.fc26kernel-4.14.0-0.rc1.git0.1.vanilla.knurd.1.fc25
Diffstat (limited to 'kernel-ppc64.config')
| -rw-r--r-- | kernel-ppc64.config | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel-ppc64.config b/kernel-ppc64.config index ee0039893..f3434f5dc 100644 --- a/kernel-ppc64.config +++ b/kernel-ppc64.config @@ -2020,6 +2020,7 @@ CONFIG_INPUT_PMIC8XXX_PWRKEY=m CONFIG_INPUT_POLLDEV=m CONFIG_INPUT_POWERMATE=m CONFIG_INPUT_PWM_BEEPER=m +# CONFIG_INPUT_PWM_VIBRA is not set CONFIG_INPUT_RETU_PWRBUTTON=m CONFIG_INPUT_RK805_PWRKEY=m CONFIG_INPUT_SPARSEKMAP=m @@ -4936,6 +4937,7 @@ CONFIG_SQUASHFS=m CONFIG_SQUASHFS_XATTR=y CONFIG_SQUASHFS_XZ=y CONFIG_SQUASHFS_ZLIB=y +CONFIG_SQUASHFS_ZSTD=y # CONFIG_SRAM is not set # CONFIG_SRF04 is not set # CONFIG_SRF08 is not set |