diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-11-20 15:06:30 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-11-20 15:06:30 +0300 |
| commit | ff6f08ab00e0b0c5d58ce6ba19e32cc880da3a6c (patch) | |
| tree | 7a629c258ae43f0dc42bf3de284ff703540173e6 | |
| parent | 950e619a98ee5a6d29c8d6422fec47009f7de29f (diff) | |
| parent | b316a9f98a2e328d10f5ed3c341fa28880152af3 (diff) | |
| download | linux-ff6f08ab00e0b0c5d58ce6ba19e32cc880da3a6c.tar.xz | |
Merge tag 'arm-soc/for-3.19/cygnus-defconfig-v2' of http://github.com/brcm/linux into next/soc
Pull "Broadcom Cygnus SoC defconfig" from Florian Fainelli:
This pull requests removes one level in menuconfig for the BCM SoCs for the
bcm_defconfig file.
* tag 'arm-soc/for-3.19/cygnus-defconfig-v2' of http://github.com/brcm/linux:
ARM: bcm_defconfig: remove one level of menu from Kconfig
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| -rw-r--r-- | arch/arm/configs/bcm_defconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/configs/bcm_defconfig b/arch/arm/configs/bcm_defconfig index bc614f44b33d..83a87e48901c 100644 --- a/arch/arm/configs/bcm_defconfig +++ b/arch/arm/configs/bcm_defconfig @@ -25,7 +25,8 @@ CONFIG_MODULE_UNLOAD=y # CONFIG_BLK_DEV_BSG is not set CONFIG_PARTITION_ADVANCED=y CONFIG_ARCH_BCM=y -CONFIG_ARCH_BCM_MOBILE=y +CONFIG_ARCH_BCM_21664=y +CONFIG_ARCH_BCM_281XX=y CONFIG_ARM_THUMBEE=y CONFIG_SMP=y CONFIG_PREEMPT=y |