diff options
| author | David S. Miller <davem@davemloft.net> | 2017-10-10 06:11:09 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-10-10 06:11:09 +0300 |
| commit | d93fa2ba64384a0bbee4ae7409d85fccb2cfcf14 (patch) | |
| tree | 8e55d9d74f46ce13e4299d23c23c72b9306798c1 /arch/arc/configs/hsdk_defconfig | |
| parent | d0e60206bea2dec46c0a28fd6b116646aa67c5ae (diff) | |
| parent | 529a86e063e9ff625c4ff247d8aa17d8072444fb (diff) | |
| download | linux-d93fa2ba64384a0bbee4ae7409d85fccb2cfcf14.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'arch/arc/configs/hsdk_defconfig')
| -rw-r--r-- | arch/arc/configs/hsdk_defconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arc/configs/hsdk_defconfig b/arch/arc/configs/hsdk_defconfig index 9a3fcf446388..15f0f6b5fec1 100644 --- a/arch/arc/configs/hsdk_defconfig +++ b/arch/arc/configs/hsdk_defconfig @@ -63,6 +63,7 @@ CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_PLTFM=y CONFIG_MMC_DW=y # CONFIG_IOMMU_SUPPORT is not set +CONFIG_RESET_HSDK=y CONFIG_EXT3_FS=y CONFIG_VFAT_FS=y CONFIG_TMPFS=y @@ -72,7 +73,7 @@ CONFIG_NLS_ISO8859_1=y # CONFIG_ENABLE_WARN_DEPRECATED is not set # CONFIG_ENABLE_MUST_CHECK is not set CONFIG_STRIP_ASM_SYMS=y -CONFIG_LOCKUP_DETECTOR=y +CONFIG_SOFTLOCKUP_DETECTOR=y CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=10 # CONFIG_SCHED_DEBUG is not set # CONFIG_DEBUG_PREEMPT is not set |