diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-02-16 07:31:34 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-02-16 07:31:34 +0100 |
| commit | 8d532137b10f3712f1d335a497432d901bc9afdb (patch) | |
| tree | a78d9f58a5b15d902e7bfb42bbc6272edaca13f2 /kernel-ppc64le.config | |
| parent | 7a32163cb2233d817d73edcb3c03d8a8b3074957 (diff) | |
| parent | f43646ce1aae0ecb06518dcdcb267398c9303427 (diff) | |
| download | kernel-8d532137b10f3712f1d335a497432d901bc9afdb.tar.gz kernel-8d532137b10f3712f1d335a497432d901bc9afdb.tar.xz kernel-8d532137b10f3712f1d335a497432d901bc9afdb.zip | |
Merge remote-tracking branch 'origin/master'kernel-4.10.0-0.rc8.git0.2.vanilla.knurd.1.fc26kernel-4.10.0-0.rc8.git0.2.vanilla.knurd.1.fc25kernel-4.10.0-0.rc8.git0.2.vanilla.knurd.1.fc24
Diffstat (limited to 'kernel-ppc64le.config')
| -rw-r--r-- | kernel-ppc64le.config | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config index e565b2f54..48bee7544 100644 --- a/kernel-ppc64le.config +++ b/kernel-ppc64le.config @@ -3679,8 +3679,8 @@ CONFIG_PTP_1588_CLOCK_PCH=m CONFIG_PWM_HIBVT=m # CONFIG_PWM_PCA9685 is not set CONFIG_PWM=y -# CONFIG_PWRSEQ_EMMC is not set -# CONFIG_PWRSEQ_SIMPLE is not set +CONFIG_PWRSEQ_EMMC=m +CONFIG_PWRSEQ_SIMPLE=m # CONFIG_QCA7000 is not set CONFIG_QCOM_ADSP_PIL=m # CONFIG_QCOM_EBI2 is not set @@ -4871,7 +4871,7 @@ CONFIG_TIFM_7XX1=m CONFIG_TIFM_CORE=m CONFIG_TIGON3=m # CONFIG_TIMB_DMA is not set -CONFIG_TIMER_STATS=y +# CONFIG_TIMER_STATS is not set CONFIG_TIPC=m # CONFIG_TIPC_MEDIA_IB is not set CONFIG_TIPC_MEDIA_UDP=y |