瀏覽代碼

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>
Arnd Bergmann 10 年之前
父節點
當前提交
ff6f08ab00
共有 1 個文件被更改,包括 2 次插入1 次删除
  1. 2 1
      arch/arm/configs/bcm_defconfig

+ 2 - 1
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