diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-11-20 13:05:39 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-11-20 13:05:39 +0100 |
| commit | 950e619a98ee5a6d29c8d6422fec47009f7de29f (patch) | |
| tree | 786c1fcf4aec30f751e1cd1cb2226a3db2f3bee7 /arch/arm/mach-bcm/Makefile | |
| parent | ARM: debug: move StrongARM debug include to arch/arm/include/debug (diff) | |
| parent | ARM: mach-bcm: ARCH_BCM_MOBILE: remove one level of menu from Kconfig (diff) | |
| download | linux-950e619a98ee5a6d29c8d6422fec47009f7de29f.tar.xz linux-950e619a98ee5a6d29c8d6422fec47009f7de29f.zip | |
Merge tag 'arm-soc/for-3.19/cygnus-platform-v2' of http://github.com/brcm/linux into next/soc
Pull "Broadcom Cygnus SoC platform support" from Florian Fainelli:
This pull request contains the platform code to support the Broadcom Cygnus SoC
using the iProc architecture:
- add support for the Broadcom Cygnus SoC
- consolidate the BCM5301X Kconfig options under the iProc menuconfig entry
- remove one level of menu in menuconfig
* tag 'arm-soc/for-3.19/cygnus-platform-v2' of http://github.com/brcm/linux:
ARM: mach-bcm: ARCH_BCM_MOBILE: remove one level of menu from Kconfig
ARM: mach-bcm: Consolidate currently supported IPROC SoCs
ARM: cygnus: Initial support for Broadcom Cygnus SoC
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-bcm/Makefile')
| -rw-r--r-- | arch/arm/mach-bcm/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-bcm/Makefile b/arch/arm/mach-bcm/Makefile index 6710ea321220..4c38674c73ec 100644 --- a/arch/arm/mach-bcm/Makefile +++ b/arch/arm/mach-bcm/Makefile @@ -10,6 +10,9 @@ # of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. +# Cygnus +obj-$(CONFIG_ARCH_BCM_CYGNUS) += bcm_cygnus.o + # BCM281XX obj-$(CONFIG_ARCH_BCM_281XX) += board_bcm281xx.o |