diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2013-01-02 13:20:38 -0800 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2013-01-10 10:45:39 -0800 |
| commit | 8bb86ead0663b098bd9770f457db5b797ae2f071 (patch) | |
| tree | 2c59fad9556a87cd06d9ff81a401597b9680a1fa /arch/arm | |
| parent | e62359283cc5ce3264a1634f822822669c6b2d9f (diff) | |
| download | linux-8bb86ead0663b098bd9770f457db5b797ae2f071.tar.gz linux-8bb86ead0663b098bd9770f457db5b797ae2f071.tar.bz2 linux-8bb86ead0663b098bd9770f457db5b797ae2f071.zip | |
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: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-s3c64xx/mach-crag6410.c | 3 | ||||
| -rw-r--r-- | arch/arm/mach-s3c64xx/pm.c | 3 | ||||
| -rw-r--r-- | arch/arm/mach-s3c64xx/regs-gpio-memport.h (renamed from arch/arm/mach-s3c64xx/include/mach/regs-gpio-memport.h) | 9 |
3 files changed, 7 insertions, 8 deletions
diff --git a/arch/arm/mach-s3c64xx/mach-crag6410.c b/arch/arm/mach-s3c64xx/mach-crag6410.c index d5599694457b..e1a0742b2509 100644 --- a/arch/arm/mach-s3c64xx/mach-crag6410.c +++ b/arch/arm/mach-s3c64xx/mach-crag6410.c @@ -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 */ diff --git a/arch/arm/mach-s3c64xx/pm.c b/arch/arm/mach-s3c64xx/pm.c index 7feb426fc202..f4319874ce59 100644 --- a/arch/arm/mach-s3c64xx/pm.c +++ b/arch/arm/mach-s3c64xx/pm.c @@ -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; diff --git a/arch/arm/mach-s3c64xx/include/mach/regs-gpio-memport.h b/arch/arm/mach-s3c64xx/regs-gpio-memport.h index 82342f6fd27d..b927593019f5 100644 --- a/arch/arm/mach-s3c64xx/include/mach/regs-gpio-memport.h +++ b/arch/arm/mach-s3c64xx/regs-gpio-memport.h @@ -1,5 +1,4 @@ -/* 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 */ |