diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-10-06 16:03:48 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-10-06 16:03:48 +0200 |
| commit | bd57a6a90e44d54281e2459be6bec5699e758499 (patch) | |
| tree | 6b0ca1e344bf8a69af618cccffa20509870bfa5b /arch/arm | |
| parent | Merge tag 'renesas-defconfig-for-v4.4' of git://git.kernel.org/pub/scm/linux/... (diff) | |
| parent | ARM: multi_v7_defconfig: Add NSP to defconfig (diff) | |
| download | linux-bd57a6a90e44d54281e2459be6bec5699e758499.tar.xz linux-bd57a6a90e44d54281e2459be6bec5699e758499.zip | |
Merge tag 'arm-soc/for-4.4/defconfig' of http://github.com/Broadcom/stblinux into next/defconfig
Merge "Broadcom defconfig changes for v4.4" from Florian Fainelli:
This pull request contains the following changes for the multi_v7_defconfig:
- Jon adds support for the NorthStar Plus SocS to the multi_v7_defconfig file
* tag 'arm-soc/for-4.4/defconfig' of http://github.com/Broadcom/stblinux:
ARM: multi_v7_defconfig: Add NSP to defconfig
Diffstat (limited to 'arch/arm')
| -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 e682da3f9d42..824b3318a446 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -25,6 +25,7 @@ CONFIG_SOC_SAMA5D3=y CONFIG_SOC_SAMA5D4=y CONFIG_ARCH_BCM=y CONFIG_ARCH_BCM_CYGNUS=y +CONFIG_ARCH_BCM_NSP=y CONFIG_ARCH_BCM_21664=y CONFIG_ARCH_BCM_281XX=y CONFIG_ARCH_BCM_5301X=y |