diff options
author | Tejun Heo <tj@kernel.org> | 2016-09-06 18:35:56 +0200 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2016-09-06 18:35:56 +0200 |
commit | 2536524a91fe5c5a9fddd282fd4e79ee0976aefe (patch) | |
tree | 30eb5b4cd6d9ed4fda69526537d4fac454cbc5e6 /arch/arm/mach-mvebu/Makefile | |
parent | libata: SCT Write Same handle ATA_DFLAG_PIO (diff) | |
parent | Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert... (diff) | |
download | linux-2536524a91fe5c5a9fddd282fd4e79ee0976aefe.tar.xz linux-2536524a91fe5c5a9fddd282fd4e79ee0976aefe.zip |
Merge branch 'master' into for-4.9
Diffstat (limited to 'arch/arm/mach-mvebu/Makefile')
-rw-r--r-- | arch/arm/mach-mvebu/Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-mvebu/Makefile b/arch/arm/mach-mvebu/Makefile index e53c6cfcab51..6c6497e80a7b 100644 --- a/arch/arm/mach-mvebu/Makefile +++ b/arch/arm/mach-mvebu/Makefile @@ -1,5 +1,4 @@ -ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include \ - -I$(srctree)/arch/arm/plat-orion/include +ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/arch/arm/plat-orion/include AFLAGS_coherency_ll.o := -Wa,-march=armv7-a CFLAGS_pmsu.o := -march=armv7-a |