From fbba791970d4d9f7d8aa8d97ae8f8e28cb4fc627 Mon Sep 17 00:00:00 2001 From: Kukjin Kim Date: Thu, 9 Sep 2010 21:57:29 +0900 Subject: [PATCH] --- yaml --- r: 212647 b: refs/heads/master c: fe0cdec8bad919fd91cd344123906a55f3857209 h: refs/heads/master i: 212645: 2d6aea7891ef506c00f371723f37a994e79fd7c7 212643: 7fdf9be268e4df8697ae26a171517cda17f5df2e 212639: c1bf4390a06bbb5d1eb0e56beb418aa29bb0badc v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-s5pv310/cpu.c | 2 +- trunk/arch/arm/mach-s5pv310/include/mach/map.h | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 616bc90c8b3c..f90030389fec 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 138a6c7f4ff56b9886cbb46656ac7f26f990cdb4 +refs/heads/master: fe0cdec8bad919fd91cd344123906a55f3857209 diff --git a/trunk/arch/arm/mach-s5pv310/cpu.c b/trunk/arch/arm/mach-s5pv310/cpu.c index 3b9c872ed68d..4add39853ff9 100644 --- a/trunk/arch/arm/mach-s5pv310/cpu.c +++ b/trunk/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/trunk/arch/arm/mach-s5pv310/include/mach/map.h b/trunk/arch/arm/mach-s5pv310/include/mach/map.h index 204f386a3b6b..aff6d23624bb 100644 --- a/trunk/arch/arm/mach-s5pv310/include/mach/map.h +++ b/trunk/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))