diff options
author | Rob Herring <rob.herring@calxeda.com> | 2012-09-27 11:10:12 -0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-09-28 16:27:07 -0400 |
commit | 46f2007c1efadfa4071c17e75f140c47f09293de (patch) | |
tree | e38579fafadcc3b8ae70575339647cd444e34f7c /arch/arm/mach-mvebu/Makefile | |
parent | 30411c2cad86bac4736589b116c7234c33ceec8f (diff) |
ARM: mvebu: fix build breaks from multi-platform conversion
Moving ARCH_MVEBU for multi-platform support caused several breakages in
recently added addr-map and pinctrl support for mvebu. This adds the
necessary selects and include paths to fix the build.
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Gregory CLEMENT <gregory.clement@free-electrons.com>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-mvebu/Makefile')
-rw-r--r-- | arch/arm/mach-mvebu/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-mvebu/Makefile b/arch/arm/mach-mvebu/Makefile index cbe566443063..57f996b6aa0e 100644 --- a/arch/arm/mach-mvebu/Makefile +++ b/arch/arm/mach-mvebu/Makefile | |||
@@ -1,4 +1,5 @@ | |||
1 | ccflags-$(ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include | 1 | ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include \ |
2 | -I$(srctree)/arch/arm/plat-orion/include | ||
2 | 3 | ||
3 | obj-y += system-controller.o | 4 | obj-y += system-controller.o |
4 | obj-$(CONFIG_MACH_ARMADA_370_XP) += armada-370-xp.o irq-armada-370-xp.o addr-map.o | 5 | obj-$(CONFIG_MACH_ARMADA_370_XP) += armada-370-xp.o irq-armada-370-xp.o addr-map.o |