Commit ff6f08ab authored Nov 20, 2014 by Arnd Bergmann

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>

parents 950e619a b316a9f9

arch/arm/configs/bcm_defconfig

+2 −1

Original line number	Diff line number	Diff line
		@@ -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