diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-07-12 19:18:03 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-07-12 19:18:03 +0200 |
| commit | ba06d1672cfd783e5d3733acc84e5885604be53c (patch) | |
| tree | 975d2ed7343fbb0f6862081b6a0d842d5dc6ca7a /kernel-x86_64.config | |
| parent | 4bb46669549d075d7e1cf5bb4f8e3e6b64ac2026 (diff) | |
| parent | e77b66876d60dad2a961719bea42e5da9a553f19 (diff) | |
| download | kernel-4.13.0-0.rc0.git6.1.vanilla.knurd.1.fc25.tar.gz kernel-4.13.0-0.rc0.git6.1.vanilla.knurd.1.fc25.tar.xz kernel-4.13.0-0.rc0.git6.1.vanilla.knurd.1.fc25.zip | |
Merge remote-tracking branch 'origin/master'kernel-4.13.0-0.rc0.git6.1.vanilla.knurd.1.fc27kernel-4.13.0-0.rc0.git6.1.vanilla.knurd.1.fc26kernel-4.13.0-0.rc0.git6.1.vanilla.knurd.1.fc25kernel-4.13.0-0.rc0.git6.1.vanilla.knurd.1.fc24
Diffstat (limited to 'kernel-x86_64.config')
| -rw-r--r-- | kernel-x86_64.config | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel-x86_64.config b/kernel-x86_64.config index 1e3cef174..794a5fafb 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -1725,6 +1725,7 @@ CONFIG_HID_GYRATION=m CONFIG_HID_HOLTEK=m CONFIG_HID_HYPERV_MOUSE=m CONFIG_HID_ICADE=m +CONFIG_HID_ITE=m CONFIG_HID_KENSINGTON=m CONFIG_HID_KEYTOUCH=m CONFIG_HID_KYE=m @@ -1751,6 +1752,7 @@ CONFIG_HID_PLANTRONICS=m CONFIG_HID_PRIMAX=m CONFIG_HID_PRODIKEYS=m CONFIG_HIDRAW=y +CONFIG_HID_RETRODE=m CONFIG_HID_RMI=m CONFIG_HID_ROCCAT=m CONFIG_HID_SAITEK=m @@ -6006,6 +6008,7 @@ CONFIG_W83977F_WDT=m # CONFIG_WAFER_WDT is not set # CONFIG_WAN is not set CONFIG_WATCHDOG_CORE=y +CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y # CONFIG_WATCHDOG_NOWAYOUT is not set # CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set CONFIG_WATCHDOG_SYSFS=y |