From 7f195465db10b33f0e945bb5e0da0220987e1364 Mon Sep 17 00:00:00 2001 From: "Milton D. Miller II" Date: Thu, 24 Mar 2016 16:32:58 -0500 Subject: [PATCH] arm: aspeed: Remove include/machine directory Remove the need for the include/mach-aspeed directory like the other platforms included in the multiplatform kernel. That is, move the include files to the machine directory with their users. Using git grep shows exactly one use of ast2400.h in the tree. This reduces our diff to upstream, removing the hack to allow the include file to be found. I decided not to merge the file as the contents will eventually be encoded in the device tree. Signed-off-by: Milton Miller --- arch/arm/Makefile | 2 ++ arch/arm/mach-aspeed/aspeed.c | 2 +- arch/arm/mach-aspeed/{include/mach => }/ast2400.h | 0 3 files changed, 3 insertions(+), 1 deletion(-) rename arch/arm/mach-aspeed/{include/mach => }/ast2400.h (100%) diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 69bd768fb384a9..299cc137b1cef2 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -259,11 +259,13 @@ endif machdirs := $(patsubst %,arch/arm/mach-%/,$(machine-y)) platdirs := $(patsubst %,arch/arm/plat-%/,$(sort $(plat-y))) +ifneq ($(CONFIG_ARCH_MULTIPLATFORM),y) ifeq ($(KBUILD_SRC),) KBUILD_CPPFLAGS += $(patsubst %,-I%include,$(machdirs) $(platdirs)) else KBUILD_CPPFLAGS += $(patsubst %,-I$(srctree)/%include,$(machdirs) $(platdirs)) endif +endif export TEXT_OFFSET GZFLAGS MMUEXT diff --git a/arch/arm/mach-aspeed/aspeed.c b/arch/arm/mach-aspeed/aspeed.c index f3180fc04524e5..4a0200c8a3d3e5 100644 --- a/arch/arm/mach-aspeed/aspeed.c +++ b/arch/arm/mach-aspeed/aspeed.c @@ -6,7 +6,7 @@ #include #include #include -#include +#include "ast2400.h" // XXX TEMP HACKERY // diff --git a/arch/arm/mach-aspeed/include/mach/ast2400.h b/arch/arm/mach-aspeed/ast2400.h similarity index 100% rename from arch/arm/mach-aspeed/include/mach/ast2400.h rename to arch/arm/mach-aspeed/ast2400.h