From 57cfeb5140642b1071b01a7cc5c34d4ef3166180 Mon Sep 17 00:00:00 2001
From: Thomas Chou <thomas@wytron.com.tw>
Date: Mon, 25 Aug 2014 17:09:07 +0800
Subject: [PATCH] nios2: move nios2.h to arch asm directory

The nios2.h is nios2 cpu specific, and should go arch asm
directory.

Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
---
 arch/nios2/cpu/cpu.c                        | 2 +-
 arch/nios2/cpu/interrupts.c                 | 2 +-
 {include => arch/nios2/include/asm}/nios2.h | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename {include => arch/nios2/include/asm}/nios2.h (95%)

diff --git a/arch/nios2/cpu/cpu.c b/arch/nios2/cpu/cpu.c
index 36ea90b..39ae972 100644
--- a/arch/nios2/cpu/cpu.c
+++ b/arch/nios2/cpu/cpu.c
@@ -6,7 +6,7 @@
  */
 
 #include <common.h>
-#include <nios2.h>
+#include <asm/nios2.h>
 #include <asm/cache.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/nios2/cpu/interrupts.c b/arch/nios2/cpu/interrupts.c
index b363a1f..9d7e193 100644
--- a/arch/nios2/cpu/interrupts.c
+++ b/arch/nios2/cpu/interrupts.c
@@ -9,7 +9,7 @@
  */
 
 
-#include <nios2.h>
+#include <asm/nios2.h>
 #include <asm/types.h>
 #include <asm/io.h>
 #include <asm/ptrace.h>
diff --git a/include/nios2.h b/arch/nios2/include/asm/nios2.h
similarity index 95%
rename from include/nios2.h
rename to arch/nios2/include/asm/nios2.h
index 0539ec3..abe4df3 100644
--- a/include/nios2.h
+++ b/arch/nios2/include/asm/nios2.h
@@ -5,8 +5,8 @@
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
-#ifndef __NIOS2_H__
-#define __NIOS2_H__
+#ifndef __ASM_NIOS2_H__
+#define __ASM_NIOS2_H__
 
 /*------------------------------------------------------------------------
  * Control registers -- use with wrctl() & rdctl()
@@ -37,4 +37,4 @@
 #define CACHE_BYPASS(a) ((a) | 0x80000000)
 #define CACHE_NO_BYPASS(a) ((a) & ~0x80000000)
 
-#endif /* __NIOS2_H__ */
+#endif /* __ASM_NIOS2_H__ */