sync in heftig changes from last config, leave amdgpu_si disabled

This commit is contained in:
Tobias Powalowski 2016-12-25 18:04:44 +00:00
parent 8ee287bbbe
commit ac7317673a

View File

@ -1434,7 +1434,8 @@ CONFIG_BATMAN_ADV_BLA=y
CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DAT=y
CONFIG_BATMAN_ADV_NC=y CONFIG_BATMAN_ADV_NC=y
CONFIG_BATMAN_ADV_MCAST=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=m
CONFIG_OPENVSWITCH_GRE=m CONFIG_OPENVSWITCH_GRE=m
CONFIG_OPENVSWITCH_VXLAN=m CONFIG_OPENVSWITCH_VXLAN=m
@ -4143,7 +4144,11 @@ CONFIG_USBPCWATCHDOG=m
# #
# Watchdog Pretimeout Governors # 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 CONFIG_SSB_POSSIBLE=y
# #