diff options
author | Arnd Bergmann <arnd@arndb.de> | 2015-12-16 00:57:08 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2015-12-16 00:57:08 +0100 |
commit | 3081dc9eff32519bc3298c6dba0b877675d4c1cd (patch) | |
tree | d4c1d2af14e09e96dd015fa9163df88106b11ddf /arch/arm/mach-mv78xx0/Makefile | |
parent | 22ba14f41ca6b7f96fe3d4a8eb116358060595fd (diff) | |
parent | c5d431e8c511788556651b91debd7d77d4508f4b (diff) |
Merge tag 'mvebu-soc-4.5-1' of git://git.infradead.org/linux-mvebu into next/multiplatform
Merge "mvebu soc for 4.5 (part 1)" from Gregory CLEMENT:
- orion5x/mv78xx0 multiplatform conversion
- legacy dove PMU support conversion
* tag 'mvebu-soc-4.5-1' of git://git.infradead.org/linux-mvebu:
ARM: dove: convert legacy dove to PMU support
soc: dove: add legacy support to PMU driver
ARM: orion5x: multiplatform support
ARM: orion5x: clean up mach/*.h headers
ARM: mv78xx0: multiplatform support
ARM: mv78xx0: clean up mach/*.h headers
ARM: orion: use SPARSE_IRQ everywhere
ARM: orion: always use MULTI_IRQ_HANDLER
ARM: orion: move watchdog setup to mach-orion5x
Conflicts:
arch/arm/Kconfig
arch/arm/mach-dove/include/mach/entry-macro.S
arch/arm/mach-orion5x/include/mach/entry-macro.S
Diffstat (limited to 'arch/arm/mach-mv78xx0/Makefile')
-rw-r--r-- | arch/arm/mach-mv78xx0/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-mv78xx0/Makefile b/arch/arm/mach-mv78xx0/Makefile index 7cd04634d302..ddb3aa98a3c7 100644 --- a/arch/arm/mach-mv78xx0/Makefile +++ b/arch/arm/mach-mv78xx0/Makefile @@ -1,3 +1,5 @@ +ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/arch/arm/plat-orion/include + obj-y += common.o mpp.o irq.o pcie.o obj-$(CONFIG_MACH_DB78X00_BP) += db78x00-bp-setup.o obj-$(CONFIG_MACH_RD78X00_MASA) += rd78x00-masa-setup.o |