diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-07-12 17:03:57 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-07-12 17:03:57 +0200 |
| commit | 3ab2eb052ed2fb10b260604bb066a0b5d7fdbe76 (patch) | |
| tree | 540c15994a43334baa8a2ed5ac77bd5b31827450 | |
| parent | 31a291653a8222da7dd2f25077552b273c4d87f2 (diff) | |
| parent | 14105ee3676ec729dee9d5f7605efd94dba4847b (diff) | |
| download | kernel-5.3.0-0.rc0.git4.1.vanilla.knurd.1.fc30.tar.gz kernel-5.3.0-0.rc0.git4.1.vanilla.knurd.1.fc30.tar.xz kernel-5.3.0-0.rc0.git4.1.vanilla.knurd.1.fc30.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.3.0-0.rc0.git4.1.vanilla.knurd.1.fc31kernel-5.3.0-0.rc0.git4.1.vanilla.knurd.1.fc30kernel-5.3.0-0.rc0.git4.1.vanilla.knurd.1.fc29
| -rw-r--r-- | configs/fedora/generic/x86/CONFIG_RTC_DRV_WILCO_EC | 2 | ||||
| -rw-r--r-- | kernel-i686-debug.config | 2 | ||||
| -rw-r--r-- | kernel-i686.config | 2 | ||||
| -rw-r--r-- | kernel-x86_64-debug.config | 2 | ||||
| -rw-r--r-- | kernel-x86_64.config | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/configs/fedora/generic/x86/CONFIG_RTC_DRV_WILCO_EC b/configs/fedora/generic/x86/CONFIG_RTC_DRV_WILCO_EC index 4bd669a69..4b86ecbf5 100644 --- a/configs/fedora/generic/x86/CONFIG_RTC_DRV_WILCO_EC +++ b/configs/fedora/generic/x86/CONFIG_RTC_DRV_WILCO_EC @@ -1 +1 @@ -CONFIG_RTC_DRV_WILCO_EC=m +# CONFIG_RTC_DRV_WILCO_EC is not set diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config index a185b0d4c..4fca45dc6 100644 --- a/kernel-i686-debug.config +++ b/kernel-i686-debug.config @@ -4662,7 +4662,7 @@ CONFIG_RTC_DRV_SD3078=m CONFIG_RTC_DRV_STK17TA8=m # CONFIG_RTC_DRV_TEST is not set CONFIG_RTC_DRV_V3020=m -CONFIG_RTC_DRV_WILCO_EC=m +# CONFIG_RTC_DRV_WILCO_EC is not set CONFIG_RTC_DRV_X1205=m # CONFIG_RTC_DRV_ZYNQMP is not set CONFIG_RTC_HCTOSYS_DEVICE="rtc0" diff --git a/kernel-i686.config b/kernel-i686.config index 264055984..25540cda5 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -4642,7 +4642,7 @@ CONFIG_RTC_DRV_SD3078=m CONFIG_RTC_DRV_STK17TA8=m # CONFIG_RTC_DRV_TEST is not set CONFIG_RTC_DRV_V3020=m -CONFIG_RTC_DRV_WILCO_EC=m +# CONFIG_RTC_DRV_WILCO_EC is not set CONFIG_RTC_DRV_X1205=m # CONFIG_RTC_DRV_ZYNQMP is not set CONFIG_RTC_HCTOSYS_DEVICE="rtc0" diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config index 3496b97ce..ca4a8edf7 100644 --- a/kernel-x86_64-debug.config +++ b/kernel-x86_64-debug.config @@ -4708,7 +4708,7 @@ CONFIG_RTC_DRV_SD3078=m CONFIG_RTC_DRV_STK17TA8=m # CONFIG_RTC_DRV_TEST is not set CONFIG_RTC_DRV_V3020=m -CONFIG_RTC_DRV_WILCO_EC=m +# CONFIG_RTC_DRV_WILCO_EC is not set CONFIG_RTC_DRV_X1205=m # CONFIG_RTC_DRV_ZYNQMP is not set CONFIG_RTC_HCTOSYS_DEVICE="rtc0" diff --git a/kernel-x86_64.config b/kernel-x86_64.config index 4fa6168ed..03cc8d576 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -4688,7 +4688,7 @@ CONFIG_RTC_DRV_SD3078=m CONFIG_RTC_DRV_STK17TA8=m # CONFIG_RTC_DRV_TEST is not set CONFIG_RTC_DRV_V3020=m -CONFIG_RTC_DRV_WILCO_EC=m +# CONFIG_RTC_DRV_WILCO_EC is not set CONFIG_RTC_DRV_X1205=m # CONFIG_RTC_DRV_ZYNQMP is not set CONFIG_RTC_HCTOSYS_DEVICE="rtc0" |