diff options
| author | Olof Johansson <olof@lixom.net> | 2014-03-11 16:28:32 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-03-11 16:28:32 -0400 |
| commit | 0daba17de771388a004148a357f7c63d648b0b3b (patch) | |
| tree | d810487f9b1b37b2c7b456be96fbb1cdfdca8254 /arch/arm/Makefile | |
| parent | 50776b6cf85d4b2bf3c4f209c4e01f354d0daa2c (diff) | |
| parent | d30fe6272183f3cc8b9f3f111cd36271332e4cec (diff) | |
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 | |||
| 143 | # by CONFIG_* macro name. | 143 | # by CONFIG_* macro name. |
| 144 | machine-$(CONFIG_ARCH_AT91) += at91 | 144 | machine-$(CONFIG_ARCH_AT91) += at91 |
| 145 | machine-$(CONFIG_ARCH_BCM) += bcm | 145 | machine-$(CONFIG_ARCH_BCM) += bcm |
| 146 | machine-$(CONFIG_ARCH_BCM2835) += bcm2835 | ||
| 147 | machine-$(CONFIG_ARCH_BERLIN) += berlin | 146 | machine-$(CONFIG_ARCH_BERLIN) += berlin |
| 148 | machine-$(CONFIG_ARCH_CLPS711X) += clps711x | 147 | machine-$(CONFIG_ARCH_CLPS711X) += clps711x |
| 149 | machine-$(CONFIG_ARCH_CNS3XXX) += cns3xxx | 148 | machine-$(CONFIG_ARCH_CNS3XXX) += cns3xxx |