diff options
| author | Matt Porter <mporter@linaro.org> | 2014-03-14 11:20:43 -0400 |
|---|---|---|
| committer | Matt Porter <mporter@linaro.org> | 2014-03-14 11:20:43 -0400 |
| commit | 833688f4e49f659ad90a3ea7e2905720774c3f61 (patch) | |
| tree | 1ec242f0c13e40fe9421f86561d0d81dec42fd12 /arch/arm/configs | |
| parent | 0e8b860ac6d65209beea03ee9b718089838476ef (diff) | |
| parent | fdf4850cb5b2e5e549a18b8b41abb001bfb19e9c (diff) | |
| download | lwn-833688f4e49f659ad90a3ea7e2905720774c3f61.tar.gz lwn-833688f4e49f659ad90a3ea7e2905720774c3f61.zip | |
Merge tag 'armsoc/for-3.15/soc-2' into armsoc/for-3.15/soc-3
ARM: mach-bcm soc updates
- add BCM5301x support
- remove GENERIC_TIME
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/multi_v7_defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index ee6982976d66..1b4821bc5c7a 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -11,6 +11,7 @@ CONFIG_ARCH_MVEBU=y CONFIG_MACH_ARMADA_370=y CONFIG_MACH_ARMADA_XP=y CONFIG_ARCH_BCM=y +CONFIG_ARCH_BCM_5301X=y CONFIG_ARCH_BCM_MOBILE=y CONFIG_ARCH_BERLIN=y CONFIG_MACH_BERLIN_BG2=y |