From ac7317673ad42b419130fbd3123026e448d3a327 Mon Sep 17 00:00:00 2001 From: Tobias Powalowski Date: Sun, 25 Dec 2016 18:04:44 +0000 Subject: [PATCH] sync in heftig changes from last config, leave amdgpu_si disabled --- config.x86_64 | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/config.x86_64 b/config.x86_64 index e2c600d..35f8402 100644 --- a/config.x86_64 +++ b/config.x86_64 @@ -1434,7 +1434,8 @@ CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_NC=y CONFIG_BATMAN_ADV_MCAST=y -# CONFIG_BATMAN_ADV_DEBUGFS is not set +CONFIG_BATMAN_ADV_DEBUGFS=y +CONFIG_BATMAN_ADV_DEBUG is not set CONFIG_OPENVSWITCH=m CONFIG_OPENVSWITCH_GRE=m CONFIG_OPENVSWITCH_VXLAN=m @@ -4143,7 +4144,11 @@ CONFIG_USBPCWATCHDOG=m # # Watchdog Pretimeout Governors # -# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set +CONFIG_WATCHDOG_PRETIMEOUT_GOV=y +# CONFIG_WATCHDOG_PRETIMEOUT_DEFAULT_GOV_NOOP is not set +CONFIG_WATCHDOG_PRETIMEOUT_DEFAULT_GOV_PANIC=y +CONFIG_WATCHDOG_PRETIMEOUT_GOV_NOOP=m +CONFIG_WATCHDOG_PRETIMEOUT_GOV_PANIC=y CONFIG_SSB_POSSIBLE=y #