ARM: clps711x: Used own subarch directory for store header file

There is no reason to have the clps7111.h header in a globally
visible location, so move it to a place that is only visible when
building for mach-clps711x.

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --git a/arch/arm/include/asm/hardware/clps7111.h b/arch/arm/mach-clps711x/include/mach/clps711x.h
similarity index 95%
rename from arch/arm/include/asm/hardware/clps7111.h
rename to arch/arm/mach-clps711x/include/mach/clps711x.h
index 0998606920b180fea018a5fd27287e01c8beeaab..3e0759122ba82c498800da0783c2a8326c4f31ac 100644 (file)
--- a/arch/arm/include/asm/hardware/clps7111.h
+++ b/arch/arm/mach-clps711x/include/mach/clps711x.h
@@ -1,8 +1,6 @@
 /*
- *  arch/arm/include/asm/hardware/clps7111.h
- *
- *  This file contains the hardware definitions of the CLPS7111 internal
- *  registers.
+ *  This file contains the hardware definitions of the Cirrus Logic
+ *  ARM7 CLPS711X internal registers.
  *
  *  Copyright (C) 2000 Deep Blue Solutions Ltd.
  *
@@ -20,8 +18,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-#ifndef __ASM_HARDWARE_CLPS7111_H
-#define __ASM_HARDWARE_CLPS7111_H
+#ifndef __MACH_CLPS711X_H
+#define __MACH_CLPS711X_H
 
 #define CLPS711X_PHYS_BASE     (0x80000000)
 
@@ -43,7 +41,7 @@
 #define INTSR1         (0x0240)
 #define INTMR1         (0x0280)
 #define LCDCON         (0x02c0)
-#define TC1D            (0x0300)
+#define TC1D           (0x0300)
 #define TC2D           (0x0340)
 #define RTCDR          (0x0380)
 #define RTCMR          (0x03c0)
@@ -231,4 +229,4 @@
 #define SDCONF_CASLAT_2                (2)
 #define SDCONF_CASLAT_3                (3)
 
-#endif /* __ASM_HARDWARE_CLPS7111_H */
+#endif /* __MACH_CLPS711X_H */

diff --git a/arch/arm/mach-clps711x/include/mach/hardware.h b/arch/arm/mach-clps711x/include/mach/hardware.h
index d31fc791f5169bfc7a6d1a033124c476aa88f3cf..13a64fcd7dd1d737ee478f0646bd6d5ef046fd78 100644 (file)
--- a/arch/arm/mach-clps711x/include/mach/hardware.h
+++ b/arch/arm/mach-clps711x/include/mach/hardware.h
@@ -22,7 +22,7 @@
 #ifndef __MACH_HARDWARE_H
 #define __MACH_HARDWARE_H
 
-#include <asm/hardware/clps7111.h>
+#include <mach/clps711x.h>
 
 #define CLPS711X_VIRT_BASE     IOMEM(0xff000000)
 

diff --git a/arch/arm/mach-clps711x/include/mach/uncompress.h b/arch/arm/mach-clps711x/include/mach/uncompress.h
index 263f8393ccb7d09f2b0029768db46ef81addb1af..7b28d6a476904777a9c183d7f87896c6c0a73450 100644 (file)
--- a/arch/arm/mach-clps711x/include/mach/uncompress.h
+++ b/arch/arm/mach-clps711x/include/mach/uncompress.h
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-#include <asm/hardware/clps7111.h>
+#include <mach/clps711x.h>
 
 #ifdef CONFIG_DEBUG_CLPS711X_UART2
 #define SYSFLGx        SYSFLG2