diff options
| author | Olof Johansson <olof@lixom.net> | 2014-03-11 21:28:32 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-03-11 21:28:32 +0100 |
| commit | 0daba17de771388a004148a357f7c63d648b0b3b (patch) | |
| tree | d810487f9b1b37b2c7b456be96fbb1cdfdca8254 /arch/arm/Makefile | |
| parent | Merge tag 'armsoc/for-3.15/cleanup' of git://github.com/broadcom/mach-bcm int... (diff) | |
| parent | ARM: bcm2835: Move to mach-bcm directory (diff) | |
| download | linux-0daba17de771388a004148a357f7c63d648b0b3b.tar.xz linux-0daba17de771388a004148a357f7c63d648b0b3b.zip | |
Merge tag 'bcm2835-for-3.15-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-rpi into next/cleanup
Merge "ARM: bcm2835: consolidate into mach-bcm/" from Stephen Warren:
This pull request consists of a single patch which moves files from
arch/arm/mach-bcm2835 into mach-bcm, thus consolidating them with
support for other Broadcom chips.
* tag 'bcm2835-for-3.15-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-rpi:
ARM: bcm2835: Move to mach-bcm directory
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/Makefile')
| -rw-r--r-- | arch/arm/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index dd1bd7ed77be..3d2331e31af5 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -143,7 +143,6 @@ textofs-$(CONFIG_ARCH_MSM8960) := 0x00208000 # by CONFIG_* macro name. machine-$(CONFIG_ARCH_AT91) += at91 machine-$(CONFIG_ARCH_BCM) += bcm -machine-$(CONFIG_ARCH_BCM2835) += bcm2835 machine-$(CONFIG_ARCH_BERLIN) += berlin machine-$(CONFIG_ARCH_CLPS711X) += clps711x machine-$(CONFIG_ARCH_CNS3XXX) += cns3xxx |