aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm64/Kconfig.platforms
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2016-09-13 10:31:40 +0200
committerLinus Walleij <linus.walleij@linaro.org>2016-09-13 10:31:40 +0200
commiteb8994172a45029f3f589fd6b2bd5d54e5b6e036 (patch)
treee99afa7659fdd6577616e110662386575b721b2c /arch/arm64/Kconfig.platforms
parentgpio: pca953x: initialize ret to zero to avoid returning garbage (diff)
parentLinux 4.8-rc2 (diff)
downloadlinux-dev-eb8994172a45029f3f589fd6b2bd5d54e5b6e036.tar.xz
linux-dev-eb8994172a45029f3f589fd6b2bd5d54e5b6e036.zip
Merge tag 'v4.8-rc2' into devel
Linux 4.8-rc2
Diffstat (limited to 'arch/arm64/Kconfig.platforms')
-rw-r--r--arch/arm64/Kconfig.platforms4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms
index 4fb0bef0f094..41d82b327e6a 100644
--- a/arch/arm64/Kconfig.platforms
+++ b/arch/arm64/Kconfig.platforms
@@ -8,7 +8,7 @@ config ARCH_SUNXI
config ARCH_ALPINE
bool "Annapurna Labs Alpine platform"
- select ALPINE_MSI
+ select ALPINE_MSI if PCI
help
This enables support for the Annapurna Labs Alpine
Soc family.
@@ -66,7 +66,7 @@ config ARCH_LG1K
config ARCH_HISI
bool "Hisilicon SoC Family"
select ARM_TIMER_SP804
- select HISILICON_IRQ_MBIGEN
+ select HISILICON_IRQ_MBIGEN if PCI
help
This enables support for Hisilicon ARMv8 SoC family