| commit | 5ef7307f5b667df7832f3939fee8afe0deb9ead7 | [log] [tgz] |
|---|---|---|
| author | Linux Build Service Account <lnxbuild@localhost> | Tue Sep 18 16:34:18 2012 -0700 |
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | Tue Sep 18 16:34:15 2012 -0700 |
| tree | 1e40b079b670bbaf9b7b6794e4e521a5bd25be37 | |
| parent | 71d4fa35a48caf34461c203769aab78f32b43fac [diff] | |
| parent | 3e355011a42ca861bb2b71d1b88e9c79da710902 [diff] |
Merge "msm: iomap: correct 8092 shared memory mapping"
diff --git a/arch/arm/mach-msm/io.c b/arch/arm/mach-msm/io.c index 5430f99..e0fec65 100644 --- a/arch/arm/mach-msm/io.c +++ b/arch/arm/mach-msm/io.c
@@ -497,7 +497,7 @@ void __init msm_map_mpq8092_io(void) { - msm_shared_ram_phys = MSM8974_MSM_SHARED_RAM_PHYS; + msm_shared_ram_phys = MSM8092_MSM_SHARED_RAM_PHYS; msm_map_io(mpq8092_io_desc, ARRAY_SIZE(mpq8092_io_desc)); } #endif /* CONFIG_ARCH_MPQ8092 */