diff options
| author | Olof Johansson <olof@lixom.net> | 2014-03-12 00:18:21 +0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-03-12 00:18:36 +0400 |
| commit | 07cb1ec1ae18828e0b187ef67e9e465623d1ea7b (patch) | |
| tree | 774e837518dedff75b65945fc1c728fbe30269fd /arch/arm/configs | |
| parent | 42dc836dbe719b0f7afef1794a12a53fa6d7f723 (diff) | |
| parent | fdf4850cb5b2e5e549a18b8b41abb001bfb19e9c (diff) | |
| download | linux-07cb1ec1ae18828e0b187ef67e9e465623d1ea7b.tar.xz | |
Merge tag 'armsoc/for-3.15/soc-2' of git://github.com/broadcom/mach-bcm into next/soc
Merge "ARM: mach-bcm soc updates" from Matt Porter:
- add BCM5301x support
- remove GENERIC_TIME
* tag 'armsoc/for-3.15/soc-2' of git://github.com/broadcom/mach-bcm:
ARM: BCM5301X: workaround suppress fault
ARM: BCM5301X: add early debugging support
ARM: BCM5301X: initial support for the BCM5301X/BCM470X SoCs with ARM CPU
ARM: mach-bcm: Remove GENERIC_TIME
Signed-off-by: Olof Johansson <olof@lixom.net>
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 |