Commit 8bb86ead authored by Kukjin Kim's avatar Kukjin Kim
Browse files

ARM: S3C64XX: make regs-gpio-memport.h local 



The header can be local in mach-s3c64xx/.

Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent e6235928

arch/arm/mach-s3c64xx/mach-crag6410.c

+1 −2
Original line number Diff line number Diff line
@@ -54,8 +54,6 @@ 
#include <mach/regs-gpio.h>

#include <mach/regs-modem.h>



#include <mach/regs-gpio-memport.h>



#include <plat/regs-serial.h>

#include <plat/fb.h>

#include <plat/sdhci.h>
@@ -72,6 +70,7 @@ 


#include "common.h"

#include "crag6410.h"

#include "regs-gpio-memport.h"



/* serial port setup */

arch/arm/mach-s3c64xx/pm.c

+2 −1
Original line number Diff line number Diff line
@@ -30,9 +30,10 @@ 
#include <mach/regs-gpio.h>

#include <mach/regs-clock.h>

#include <mach/regs-syscon-power.h>

#include <mach/regs-gpio-memport.h>

#include <mach/regs-modem.h>



#include "regs-gpio-memport.h"



struct s3c64xx_pm_domain {

	char *const name;

	u32 ena;

arch/arm/mach-s3c64xx/include/mach/regs-gpio-memport.h→arch/arm/mach-s3c64xx/regs-gpio-memport.h

+4 −5
Original line number Diff line number Diff line 
/* linux/arch/arm/plat-s3c64xx/include/mach/regs-gpio-memport.h

 *

/*

 * Copyright 2008 Openmoko, Inc.

 * Copyright 2008 Simtec Electronics

 *      Ben Dooks <ben@simtec.co.uk>
@@ -8,8 +7,8 @@ 
 * S3C64XX - GPIO memory port register definitions

 */



#ifndef __ASM_PLAT_S3C64XX_REGS_GPIO_MEMPORT_H

#define __ASM_PLAT_S3C64XX_REGS_GPIO_MEMPORT_H __FILE__

#ifndef __MACH_S3C64XX_REGS_GPIO_MEMPORT_H

#define __MACH_S3C64XX_REGS_GPIO_MEMPORT_H __FILE__



#define S3C64XX_MEM0CONSTOP	S3C64XX_GPIOREG(0x1B0)

#define S3C64XX_MEM1CONSTOP	S3C64XX_GPIOREG(0x1B4)
@@ -21,5 +20,5 @@ 
#define S3C64XX_MEM0DRVCON	S3C64XX_GPIOREG(0x1D0)

#define S3C64XX_MEM1DRVCON	S3C64XX_GPIOREG(0x1D4)



#endif /* __ASM_PLAT_S3C64XX_REGS_GPIO_MEMPORT_H */

#endif /* __MACH_S3C64XX_REGS_GPIO_MEMPORT_H */