aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTsahee Zidenberg <tsahee@annapurnalabs.com>2015-03-26 20:34:33 +0200
committerArnd Bergmann <arnd@arndb.de>2015-04-14 01:15:25 +0200
commitb50c9c2de553102d42842db842f57c6cad676494 (patch)
tree8414ca242dbdc436cc53c97d7c98ad3e43ceda13
parentMerge tag 'samsung-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/defconfig (diff)
downloadlinux-dev-b50c9c2de553102d42842db842f57c6cad676494.tar.xz
linux-dev-b50c9c2de553102d42842db842f57c6cad676494.zip
ARM: multi_v7_defconfig: enable alpine platform
The generic PCI driver is required for SATA device probe on Alpine platform, so it cannot be modular. Signed-off-by: Tsahee Zidenberg <tsahee@annapurnalabs.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-rw-r--r--arch/arm/configs/multi_v7_defconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index b8140d3cc551..03039fb93e6d 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -12,6 +12,7 @@ CONFIG_MODULE_UNLOAD=y
CONFIG_PARTITION_ADVANCED=y
CONFIG_CMDLINE_PARTITION=y
CONFIG_ARCH_VIRT=y
+CONFIG_ARCH_ALPINE=y
CONFIG_ARCH_MVEBU=y
CONFIG_MACH_ARMADA_370=y
CONFIG_MACH_ARMADA_375=y
@@ -92,6 +93,7 @@ CONFIG_ARCH_WM8850=y
CONFIG_ARCH_ZYNQ=y
CONFIG_TRUSTED_FOUNDATIONS=y
CONFIG_PCI=y
+CONFIG_PCI_HOST_GENERIC=y
CONFIG_PCI_KEYSTONE=y
CONFIG_PCI_MSI=y
CONFIG_PCI_MVEBU=y