From: Tsahee Zidenberg <tsahee@annapurnalabs.com>
Date: Thu, 26 Mar 2015 18:34:33 +0000 (+0200)
Subject: ARM: multi_v7_defconfig: enable alpine platform
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b50c9c2de553102d42842db842f57c6cad676494;p=linux-beck.git

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>
---

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