diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-05-23 10:24:13 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-05-23 10:24:13 +0200 |
commit | e71cb878d16b9ee62e64068552a832ddb55fd4e5 (patch) | |
tree | 509b4133d3a2eb919158e2a69b00b419f4b158d1 /kernel-ppc64p7.config | |
parent | da7c2d7b2c1dd6b8b71cae0ae11595bf5faf03d3 (diff) | |
parent | 598b069364bda920f0abe32aa35dc0ad61b88066 (diff) | |
download | kernel-e71cb878d16b9ee62e64068552a832ddb55fd4e5.tar.gz kernel-e71cb878d16b9ee62e64068552a832ddb55fd4e5.tar.xz kernel-e71cb878d16b9ee62e64068552a832ddb55fd4e5.zip |
Merge remote-tracking branch 'origin/master'kernel-4.12.0-0.rc2.git0.1.vanilla.knurd.1.fc27kernel-4.12.0-0.rc2.git0.1.vanilla.knurd.1.fc26kernel-4.12.0-0.rc2.git0.1.vanilla.knurd.1.fc25kernel-4.12.0-0.rc2.git0.1.vanilla.knurd.1.fc24
Diffstat (limited to 'kernel-ppc64p7.config')
-rw-r--r-- | kernel-ppc64p7.config | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/kernel-ppc64p7.config b/kernel-ppc64p7.config index 68ad8ed06..6147d2731 100644 --- a/kernel-ppc64p7.config +++ b/kernel-ppc64p7.config @@ -1229,7 +1229,6 @@ CONFIG_EXT4_FS_SECURITY=y CONFIG_EXT4_FS=y CONFIG_EXT4_USE_FOR_EXT2=y # CONFIG_EXTCON_ADC_JACK is not set -CONFIG_EXTCON_INTEL_CHT_WC=y CONFIG_EXTCON_INTEL_INT3496=m # CONFIG_EXTCON is not set # CONFIG_EXTCON_QCOM_SPMI_MISC is not set |