diff options
| author | Alexander Shiyan <shc_work@mail.ru> | 2012-05-14 21:46:08 +0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-05-14 20:35:37 +0200 |
| commit | 27723ec4ec7fab52e4e14ec35391390b296cb9d0 (patch) | |
| tree | a4a237161732f322c4a2c534a301a218220a6d49 | |
| parent | 94bd32792e905ae25f63491f06d7d3018b350dd2 (diff) | |
| download | linux-27723ec4ec7fab52e4e14ec35391390b296cb9d0.tar.bz2 | |
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>
| -rw-r--r-- | arch/arm/mach-clps711x/include/mach/clps711x.h (renamed from arch/arm/include/asm/hardware/clps7111.h) | 14 | ||||
| -rw-r--r-- | arch/arm/mach-clps711x/include/mach/hardware.h | 2 | ||||
| -rw-r--r-- | arch/arm/mach-clps711x/include/mach/uncompress.h | 2 |
3 files changed, 8 insertions, 10 deletions
diff --git a/arch/arm/include/asm/hardware/clps7111.h b/arch/arm/mach-clps711x/include/mach/clps711x.h index 0998606920b1..3e0759122ba8 100644 --- 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 d31fc791f516..13a64fcd7dd1 100644 --- 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 263f8393ccb7..7b28d6a47690 100644 --- 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 |