diff options
| author | Jens Axboe <axboe@kernel.dk> | 2018-08-06 04:32:09 +0300 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2018-08-06 04:32:09 +0300 |
| commit | 05b9ba4b550ff67d7362608828405f9e389e8988 (patch) | |
| tree | 12b0f4e41c1491fe5087480d9c47e61aff8a1d33 /arch/arc/plat-hsdk/Kconfig | |
| parent | 704f83928c8e7da6e06144569efb15dec73278e8 (diff) | |
| parent | d72e90f33aa4709ebecc5005562f52335e106a60 (diff) | |
| download | linux-05b9ba4b550ff67d7362608828405f9e389e8988.tar.xz | |
Merge tag 'v4.18-rc6' into for-4.19/block2
Pull in 4.18-rc6 to get the NVMe core AEN change to avoid a
merge conflict down the line.
Signed-of-by: Jens Axboe <axboe@kernel.dk>
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 |