From: David Brown <davidb@codeaurora.org>
Date: Wed, 26 Jan 2011 21:29:22 +0000 (-0800)
Subject: Merge branch 'msm-8960' into msm-core
X-Git-Tag: v2.6.39-rc1~433^2~20^2~8
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=851492c6585ac10367df7880fb0001f529fa8d5c;p=karo-tx-linux.git

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
---

851492c6585ac10367df7880fb0001f529fa8d5c
diff --cc arch/arm/mach-msm/Makefile
index f4601256f35f,02294279290d..0e5c9dc23830
--- a/arch/arm/mach-msm/Makefile
+++ b/arch/arm/mach-msm/Makefile
@@@ -29,8 -24,9 +24,9 @@@ obj-$(CONFIG_MACH_HALIBUT) += board-hal
  obj-$(CONFIG_ARCH_MSM7X30) += board-msm7x30.o devices-msm7x30.o
  obj-$(CONFIG_ARCH_QSD8X50) += board-qsd8x50.o devices-qsd8x50.o
  obj-$(CONFIG_ARCH_MSM8X60) += board-msm8x60.o
+ obj-$(CONFIG_ARCH_MSM8960) += board-msm8960.o
  
 -obj-$(CONFIG_ARCH_MSM7X30) += gpiomux-7x30.o gpiomux-v1.o gpiomux.o
 +obj-$(CONFIG_ARCH_MSM7X30) += gpiomux-v1.o gpiomux.o
  obj-$(CONFIG_ARCH_QSD8X50) += gpiomux-8x50.o gpiomux-v1.o gpiomux.o
  obj-$(CONFIG_ARCH_MSM8X60) += gpiomux-8x60.o gpiomux-v2.o gpiomux.o
  ifdef CONFIG_MSM_V2_TLMM