diff options
| author | Matt Porter <mporter@linaro.org> | 2014-03-14 11:20:43 -0400 |
|---|---|---|
| committer | Matt Porter <mporter@linaro.org> | 2014-03-14 11:20:43 -0400 |
| commit | 833688f4e49f659ad90a3ea7e2905720774c3f61 (patch) | |
| tree | 1ec242f0c13e40fe9421f86561d0d81dec42fd12 /arch/arm/mach-bcm/Makefile | |
| parent | 0e8b860ac6d65209beea03ee9b718089838476ef (diff) | |
| parent | fdf4850cb5b2e5e549a18b8b41abb001bfb19e9c (diff) | |
Merge tag 'armsoc/for-3.15/soc-2' into armsoc/for-3.15/soc-3
ARM: mach-bcm soc updates
- add BCM5301x support
- remove GENERIC_TIME
Diffstat (limited to 'arch/arm/mach-bcm/Makefile')
| -rw-r--r-- | arch/arm/mach-bcm/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-bcm/Makefile b/arch/arm/mach-bcm/Makefile index c2ccd5a0f772..01649132c9f2 100644 --- a/arch/arm/mach-bcm/Makefile +++ b/arch/arm/mach-bcm/Makefile @@ -13,3 +13,4 @@ obj-$(CONFIG_ARCH_BCM_MOBILE) := board_bcm281xx.o bcm_kona_smc.o bcm_kona_smc_asm.o kona.o plus_sec := $(call as-instr,.arch_extension sec,+sec) AFLAGS_bcm_kona_smc_asm.o :=-Wa,-march=armv7-a$(plus_sec) +obj-$(CONFIG_ARCH_BCM_5301X) += bcm_5301x.o |