summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorKukjin Kim <kgene.kim@samsung.com>2010-09-09 16:57:29 +0400
committerKukjin Kim <kgene.kim@samsung.com>2010-10-19 03:02:57 +0400
commitfe0cdec8bad919fd91cd344123906a55f3857209 (patch)
tree798d928f5173a8d631c8d95b08c33975b449fc4d /arch
parent138a6c7f4ff56b9886cbb46656ac7f26f990cdb4 (diff)
downloadlinux-fe0cdec8bad919fd91cd344123906a55f3857209.tar.xz
ARM: S5PV310: Fix build error on GPIO map
This patch fixes build error about GPIO address due to conflict of commit 4d914705 and 19a2c065. - commit 4d914705: Fix on GPIO base addresses - commit 19a2c065: Moves initial map for merging S5P64X0 Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-s5pv310/cpu.c2
-rw-r--r--arch/arm/mach-s5pv310/include/mach/map.h1
2 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-s5pv310/cpu.c b/arch/arm/mach-s5pv310/cpu.c
index 3b9c872ed68d..4add39853ff9 100644
--- a/arch/arm/mach-s5pv310/cpu.c
+++ b/arch/arm/mach-s5pv310/cpu.c
@@ -57,7 +57,7 @@ static struct map_desc s5pv310_iodesc[] __initdata = {
.type = MT_DEVICE,
}, {
.virtual = (unsigned long)S5P_VA_GPIO,
- .pfn = __phys_to_pfn(S5PV310_PA_GPIO),
+ .pfn = __phys_to_pfn(S5PV310_PA_GPIO1),
.length = SZ_4K,
.type = MT_DEVICE,
}, {
diff --git a/arch/arm/mach-s5pv310/include/mach/map.h b/arch/arm/mach-s5pv310/include/mach/map.h
index 204f386a3b6b..aff6d23624bb 100644
--- a/arch/arm/mach-s5pv310/include/mach/map.h
+++ b/arch/arm/mach-s5pv310/include/mach/map.h
@@ -52,7 +52,6 @@
#define S5PV310_PA_GPIO1 (0x11400000)
#define S5PV310_PA_GPIO2 (0x11000000)
#define S5PV310_PA_GPIO3 (0x03860000)
-#define S5P_PA_GPIO S5PV310_PA_GPIO1
#define S5PV310_PA_HSMMC(x) (0x12510000 + ((x) * 0x10000))