diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2011-06-15 16:57:39 -0400 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-06-15 16:57:39 -0400 |
| commit | 2bc7c85210d75b7a8a7326284b4f608a16f52ffc (patch) | |
| tree | ca306d89f64ceeee92531cc0a9ba5d246d09f044 /arch/arm/mach-exynos4/cpu.c | |
| parent | 12610be33df5563d3f8cb141f231d4dc5b2a317f (diff) | |
| parent | df2212270ce94f12e9caed6ca04c7077672d588e (diff) | |
Merge branch 'gpio/next-tegra' into gpio/next
Conflicts:
drivers/gpio/Kconfig
drivers/gpio/Makefile
Diffstat (limited to 'arch/arm/mach-exynos4/cpu.c')
| -rw-r--r-- | arch/arm/mach-exynos4/cpu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-exynos4/cpu.c b/arch/arm/mach-exynos4/cpu.c index 08813a6f66b..9babe4473e8 100644 --- a/arch/arm/mach-exynos4/cpu.c +++ b/arch/arm/mach-exynos4/cpu.c | |||
| @@ -98,7 +98,7 @@ static struct map_desc exynos4_iodesc[] __initdata = { | |||
| 98 | .length = SZ_4K, | 98 | .length = SZ_4K, |
| 99 | .type = MT_DEVICE, | 99 | .type = MT_DEVICE, |
| 100 | }, { | 100 | }, { |
| 101 | .virtual = (unsigned long)S5P_VA_USB_HSPHY, | 101 | .virtual = (unsigned long)S3C_VA_USB_HSPHY, |
| 102 | .pfn = __phys_to_pfn(EXYNOS4_PA_HSPHY), | 102 | .pfn = __phys_to_pfn(EXYNOS4_PA_HSPHY), |
| 103 | .length = SZ_4K, | 103 | .length = SZ_4K, |
| 104 | .type = MT_DEVICE, | 104 | .type = MT_DEVICE, |