diff options
author | Herbert Xu <herbert@gondor.apana.org.au> | 2018-08-03 11:55:12 +0200 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2018-08-03 11:55:12 +0200 |
commit | c5f5aeef9b55b362ad5a0e04e4b41cd63b208842 (patch) | |
tree | 0ee2bb561e879db0a990d998359f6516dff3393b /arch/arc/plat-hsdk/Kconfig | |
parent | crypto: rmd320 - use swap macro in rmd320_transform (diff) | |
parent | crypto/arm64: aes-ce-gcm - add missing kernel_neon_begin/end pair (diff) | |
download | linux-c5f5aeef9b55b362ad5a0e04e4b41cd63b208842.tar.xz linux-c5f5aeef9b55b362ad5a0e04e4b41cd63b208842.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
Merge mainline to pick up c7513c2a2714 ("crypto/arm64: aes-ce-gcm -
add missing kernel_neon_begin/end pair").
Diffstat (limited to 'arch/arc/plat-hsdk/Kconfig')
-rw-r--r-- | arch/arc/plat-hsdk/Kconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arc/plat-hsdk/Kconfig b/arch/arc/plat-hsdk/Kconfig index 19ab3cf98f0f..9356753c2ed8 100644 --- a/arch/arc/plat-hsdk/Kconfig +++ b/arch/arc/plat-hsdk/Kconfig @@ -7,5 +7,8 @@ menuconfig ARC_SOC_HSDK bool "ARC HS Development Kit SOC" + depends on ISA_ARCV2 + select ARC_HAS_ACCL_REGS select CLK_HSDK select RESET_HSDK + select MIGHT_HAVE_PCI |