From b4521685bf00398a4db0d3abe28376bd8f1b31ed Mon Sep 17 00:00:00 2001
From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Date: Thu, 22 Oct 2009 14:21:29 +0200
Subject: [SANDBOX] Move include/asm-sandbox/arch-* to
 arch/sandbox/*/include/mach

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
 arch/sandbox/os/Makefile | 12 +++++++++++-
 arch/sandbox/os/common.c |  4 ++--
 2 files changed, 13 insertions(+), 3 deletions(-)

(limited to 'arch/sandbox/os')

diff --git a/arch/sandbox/os/Makefile b/arch/sandbox/os/Makefile
index 117f05eba0..2980301e15 100644
--- a/arch/sandbox/os/Makefile
+++ b/arch/sandbox/os/Makefile
@@ -1,4 +1,14 @@
-CPPFLAGS := -Iinclude/asm/arch -P
+machine-y := sandbox
+
+machdirs := $(patsubst %,arch/sandbox/mach-%/,$(machine-y))
+
+ifeq ($(KBUILD_SRC),)
+CPPFLAGS := $(patsubst %,-I%include,$(machdirs))
+else
+CPPFLAGS = $(patsubst %,-I$(srctree)/%include,$(machdirs))
+endif
+
+CPPFLAGS += -P
 CFLAGS := -Wall
 NOSTDINC_FLAGS :=
 
diff --git a/arch/sandbox/os/common.c b/arch/sandbox/os/common.c
index 72e4c8d702..e89d8a6d36 100644
--- a/arch/sandbox/os/common.c
+++ b/arch/sandbox/os/common.c
@@ -47,8 +47,8 @@
 /*
  * ...except the ones needed to connect with U-Boot
  */
-#include <linux.h>
-#include <hostfile.h>
+#include <mach/linux.h>
+#include <mach/hostfile.h>
 
 static struct termios term_orig, term_vi;
 static char erase_char;	/* the users erase character */
-- 
cgit v1.2.3