Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 27723ec4 authored by Alexander Shiyan's avatar Alexander Shiyan Committed by Arnd Bergmann
Browse files

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: default avatarAlexander Shiyan <shc_work@mail.ru>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 94bd3279

arch/arm/include/asm/hardware/clps7111.h→arch/arm/mach-clps711x/include/mach/clps711x.h

+6 −8
Original line number Diff line number Diff line 
/*

 *  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)
@@ -231,4 +229,4 @@ 
#define SDCONF_CASLAT_2		(2)

#define SDCONF_CASLAT_3		(3)



#endif /* __ASM_HARDWARE_CLPS7111_H */
 
#endif /* __MACH_CLPS711X_H */

arch/arm/mach-clps711x/include/mach/hardware.h

+1 −1
Original line number Diff line number Diff line
@@ -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)

arch/arm/mach-clps711x/include/mach/uncompress.h

+1 −1
Original line number Diff line number Diff line
@@ -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