diff options
| -rw-r--r-- | arch/arm/mach-s5pv310/cpu.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-s5pv310/include/mach/map.h | 1 |
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 = { | |||
| 57 | .type = MT_DEVICE, | 57 | .type = MT_DEVICE, |
| 58 | }, { | 58 | }, { |
| 59 | .virtual = (unsigned long)S5P_VA_GPIO, | 59 | .virtual = (unsigned long)S5P_VA_GPIO, |
| 60 | .pfn = __phys_to_pfn(S5PV310_PA_GPIO), | 60 | .pfn = __phys_to_pfn(S5PV310_PA_GPIO1), |
| 61 | .length = SZ_4K, | 61 | .length = SZ_4K, |
| 62 | .type = MT_DEVICE, | 62 | .type = MT_DEVICE, |
| 63 | }, { | 63 | }, { |
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 @@ | |||
| 52 | #define S5PV310_PA_GPIO1 (0x11400000) | 52 | #define S5PV310_PA_GPIO1 (0x11400000) |
| 53 | #define S5PV310_PA_GPIO2 (0x11000000) | 53 | #define S5PV310_PA_GPIO2 (0x11000000) |
| 54 | #define S5PV310_PA_GPIO3 (0x03860000) | 54 | #define S5PV310_PA_GPIO3 (0x03860000) |
| 55 | #define S5P_PA_GPIO S5PV310_PA_GPIO1 | ||
| 56 | 55 | ||
| 57 | #define S5PV310_PA_HSMMC(x) (0x12510000 + ((x) * 0x10000)) | 56 | #define S5PV310_PA_HSMMC(x) (0x12510000 + ((x) * 0x10000)) |
| 58 | 57 | ||
