diff options
author | Tsahee Zidenberg <tsahee@annapurnalabs.com> | 2015-03-26 14:34:33 -0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2015-04-13 19:15:25 -0400 |
commit | b50c9c2de553102d42842db842f57c6cad676494 (patch) | |
tree | 8414ca242dbdc436cc53c97d7c98ad3e43ceda13 | |
parent | d66e8d2e3c03bd380f23b29699d1991b1f064f22 (diff) |
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_defconfig | 2 |
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 | |||
12 | CONFIG_PARTITION_ADVANCED=y | 12 | CONFIG_PARTITION_ADVANCED=y |
13 | CONFIG_CMDLINE_PARTITION=y | 13 | CONFIG_CMDLINE_PARTITION=y |
14 | CONFIG_ARCH_VIRT=y | 14 | CONFIG_ARCH_VIRT=y |
15 | CONFIG_ARCH_ALPINE=y | ||
15 | CONFIG_ARCH_MVEBU=y | 16 | CONFIG_ARCH_MVEBU=y |
16 | CONFIG_MACH_ARMADA_370=y | 17 | CONFIG_MACH_ARMADA_370=y |
17 | CONFIG_MACH_ARMADA_375=y | 18 | CONFIG_MACH_ARMADA_375=y |
@@ -92,6 +93,7 @@ CONFIG_ARCH_WM8850=y | |||
92 | CONFIG_ARCH_ZYNQ=y | 93 | CONFIG_ARCH_ZYNQ=y |
93 | CONFIG_TRUSTED_FOUNDATIONS=y | 94 | CONFIG_TRUSTED_FOUNDATIONS=y |
94 | CONFIG_PCI=y | 95 | CONFIG_PCI=y |
96 | CONFIG_PCI_HOST_GENERIC=y | ||
95 | CONFIG_PCI_KEYSTONE=y | 97 | CONFIG_PCI_KEYSTONE=y |
96 | CONFIG_PCI_MSI=y | 98 | CONFIG_PCI_MSI=y |
97 | CONFIG_PCI_MVEBU=y | 99 | CONFIG_PCI_MVEBU=y |