From 76ada5f8b7bb4b295ced087bd3c34eb8161a1a75 Mon Sep 17 00:00:00 2001
From: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
Date: Mon, 21 Dec 2015 16:35:14 +0100
Subject: [PATCH] MIPS: au1x00: move SoC header files to
 arch/mips/mach-au1x00/include/mach/

Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
---
 arch/mips/mach-au1x00/au1x00_eth.c                           | 2 +-
 arch/mips/mach-au1x00/au1x00_serial.c                        | 2 +-
 arch/mips/mach-au1x00/au1x00_usb_ohci.c                      | 2 +-
 arch/mips/{include/asm => mach-au1x00/include/mach}/au1x00.h | 0
 board/dbau1x00/dbau1x00.c                                    | 2 +-
 board/dbau1x00/lowlevel_init.S                               | 2 +-
 board/pb1x00/lowlevel_init.S                                 | 2 +-
 board/pb1x00/pb1x00.c                                        | 2 +-
 8 files changed, 7 insertions(+), 7 deletions(-)
 rename arch/mips/{include/asm => mach-au1x00/include/mach}/au1x00.h (100%)

diff --git a/arch/mips/mach-au1x00/au1x00_eth.c b/arch/mips/mach-au1x00/au1x00_eth.c
index 3f9f91eb04..921686081f 100644
--- a/arch/mips/mach-au1x00/au1x00_eth.c
+++ b/arch/mips/mach-au1x00/au1x00_eth.c
@@ -43,7 +43,7 @@
 #include <net.h>
 #include <command.h>
 #include <asm/io.h>
-#include <asm/au1x00.h>
+#include <mach/au1x00.h>
 
 #if defined(CONFIG_CMD_MII)
 #include <miiphy.h>
diff --git a/arch/mips/mach-au1x00/au1x00_serial.c b/arch/mips/mach-au1x00/au1x00_serial.c
index 046350826a..47845049bb 100644
--- a/arch/mips/mach-au1x00/au1x00_serial.c
+++ b/arch/mips/mach-au1x00/au1x00_serial.c
@@ -11,7 +11,7 @@
 
 #include <config.h>
 #include <common.h>
-#include <asm/au1x00.h>
+#include <mach/au1x00.h>
 #include <serial.h>
 #include <linux/compiler.h>
 
diff --git a/arch/mips/mach-au1x00/au1x00_usb_ohci.c b/arch/mips/mach-au1x00/au1x00_usb_ohci.c
index 74bdb77303..42484e5712 100644
--- a/arch/mips/mach-au1x00/au1x00_usb_ohci.c
+++ b/arch/mips/mach-au1x00/au1x00_usb_ohci.c
@@ -23,7 +23,7 @@
 #include <common.h>
 #include <malloc.h>
 #include <asm/io.h>
-#include <asm/au1x00.h>
+#include <mach/au1x00.h>
 #include <usb.h>
 #include "au1x00_usb_ohci.h"
 
diff --git a/arch/mips/include/asm/au1x00.h b/arch/mips/mach-au1x00/include/mach/au1x00.h
similarity index 100%
rename from arch/mips/include/asm/au1x00.h
rename to arch/mips/mach-au1x00/include/mach/au1x00.h
diff --git a/board/dbau1x00/dbau1x00.c b/board/dbau1x00/dbau1x00.c
index bd20f6e4b0..75e6f0ef5a 100644
--- a/board/dbau1x00/dbau1x00.c
+++ b/board/dbau1x00/dbau1x00.c
@@ -7,7 +7,7 @@
 
 #include <common.h>
 #include <command.h>
-#include <asm/au1x00.h>
+#include <mach/au1x00.h>
 #include <asm/mipsregs.h>
 #include <asm/io.h>
 
diff --git a/board/dbau1x00/lowlevel_init.S b/board/dbau1x00/lowlevel_init.S
index 842fb76e58..409f8ee477 100644
--- a/board/dbau1x00/lowlevel_init.S
+++ b/board/dbau1x00/lowlevel_init.S
@@ -1,8 +1,8 @@
 /* Memory sub-system initialization code */
 
 #include <config.h>
+#include <mach/au1x00.h>
 #include <asm/regdef.h>
-#include <asm/au1x00.h>
 #include <asm/mipsregs.h>
 
 #define AU1500_SYS_ADDR		0xB1900000
diff --git a/board/pb1x00/lowlevel_init.S b/board/pb1x00/lowlevel_init.S
index b145e438f0..98d9536a7d 100644
--- a/board/pb1x00/lowlevel_init.S
+++ b/board/pb1x00/lowlevel_init.S
@@ -1,8 +1,8 @@
 /* Memory sub-system initialization code */
 
 #include <config.h>
+#include <mach/au1x00.h>
 #include <asm/regdef.h>
-#include <asm/au1x00.h>
 #include <asm/mipsregs.h>
 
 #define AU1500_SYS_ADDR		0xB1900000
diff --git a/board/pb1x00/pb1x00.c b/board/pb1x00/pb1x00.c
index 34814c47cb..eb92914a79 100644
--- a/board/pb1x00/pb1x00.c
+++ b/board/pb1x00/pb1x00.c
@@ -7,7 +7,7 @@
 
 #include <common.h>
 #include <command.h>
-#include <asm/au1x00.h>
+#include <mach/au1x00.h>
 #include <asm/mipsregs.h>
 #include <asm/io.h>
 
-- 
2.39.5