diff options
| author | David Brown <davidb@codeaurora.org> | 2011-01-26 13:29:22 -0800 |
|---|---|---|
| committer | David Brown <davidb@codeaurora.org> | 2011-01-26 13:29:22 -0800 |
| commit | 851492c6585ac10367df7880fb0001f529fa8d5c (patch) | |
| tree | bedf5360cab2314e0d9e13be7cff386841695bb3 /arch/arm/mach-msm/include/mach/io.h | |
| parent | ba5499ebfb7bc7859039d782099c75d92c394016 (diff) | |
| parent | 50ede4e39aa5b61685ca87f58422478b1a538ca8 (diff) | |
| download | blackbird-op-linux-851492c6585ac10367df7880fb0001f529fa8d5c.tar.gz blackbird-op-linux-851492c6585ac10367df7880fb0001f529fa8d5c.zip | |
Merge branch 'msm-8960' into msm-core
* msm-8960:
msm: Support for the MSM8960 RUMI3 target
msm: Support for the MSM8960 Simulator target
msm: Makefile cleanup
msm: timer: Timer support for MSM8960
msm: Add MSM 8960 cpu_is check
msm: irqs-8960: Interrupt map for MSM8960
msm: Physical offset for MSM8960
msm: io: I/O register definitions for MSM8960
msm: Generalize QGIC registers
msm: Generalize timer register mappings
msm: Add CPU queries
Diffstat (limited to 'arch/arm/mach-msm/include/mach/io.h')
| -rw-r--r-- | arch/arm/mach-msm/include/mach/io.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-msm/include/mach/io.h b/arch/arm/mach-msm/include/mach/io.h index 7386e732baad..dc1b928745e9 100644 --- a/arch/arm/mach-msm/include/mach/io.h +++ b/arch/arm/mach-msm/include/mach/io.h @@ -29,6 +29,7 @@ void __iomem *__msm_ioremap(unsigned long phys_addr, size_t size, unsigned int m void msm_map_qsd8x50_io(void); void msm_map_msm7x30_io(void); void msm_map_msm8x60_io(void); +void msm_map_msm8960_io(void); extern unsigned int msm_shared_ram_phys; |
