summaryrefslogtreecommitdiff
path: root/arch/arm/cpu/arm1176/Makefile
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2015-03-19 19:42:56 +0900
committerTom Rini <trini@konsulko.com>2015-03-28 09:03:09 -0400
commitddf6bd4876a1838bdf3202b34f5a36f165c279b1 (patch)
treef21be52675252fd4e942130a3336556b9b970a6a /arch/arm/cpu/arm1176/Makefile
parent326a682358c16afcf2c7a9617e9811e72a1f0929 (diff)
ARM: bcm283x: merge BCM2835/BCM2836 directories into mach-bcm283x
BCM2835 (used on Raspberry Pi) and BCM2836 (used on Raspberry Pi 2) are similar enough. One of the biggest differences is the ARM processor. It is reasonable to collect the source files into a single place, arch/arm/mach-bcm283x/. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Acked-by: Stephen Warren <swarren@wwwdotorg.org>
Diffstat (limited to 'arch/arm/cpu/arm1176/Makefile')
-rw-r--r--arch/arm/cpu/arm1176/Makefile2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/cpu/arm1176/Makefile b/arch/arm/cpu/arm1176/Makefile
index 480e130489..deec427447 100644
--- a/arch/arm/cpu/arm1176/Makefile
+++ b/arch/arm/cpu/arm1176/Makefile
@@ -10,5 +10,3 @@
extra-y = start.o
obj-y = cpu.o
-
-obj-$(CONFIG_BCM2835) += bcm2835/