Skip to content

Commit

Permalink
ARM: clps711x: Used own subarch directory for store header file
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Alexander Shiyan authored and Arnd Bergmann committed May 14, 2012
1 parent 94bd327 commit 27723ec
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 10 deletions.
Original file line number Diff line number Diff line change
@@ -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.
*
Expand All @@ -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)

Expand All @@ -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)
Expand Down Expand Up @@ -231,4 +229,4 @@
#define SDCONF_CASLAT_2 (2)
#define SDCONF_CASLAT_3 (3)

#endif /* __ASM_HARDWARE_CLPS7111_H */
#endif /* __MACH_CLPS711X_H */
2 changes: 1 addition & 1 deletion arch/arm/mach-clps711x/include/mach/hardware.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-clps711x/include/mach/uncompress.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 27723ec

Please sign in to comment.