diff options
| author | David Brown <davidb@codeaurora.org> | 2011-01-28 12:27:59 -0800 |
|---|---|---|
| committer | David Brown <davidb@codeaurora.org> | 2011-01-28 12:27:59 -0800 |
| commit | 2ff9870c4cccf97d777bf5551d22303e0176b201 (patch) | |
| tree | 96b9bd0645a8ba9d8bafc3f0c68fdbb7c2258275 /arch/arm/mach-msm/Makefile | |
| parent | ecca8194c16bdf6cde99a2b29c23a77901cd61a6 (diff) | |
| parent | d056fca32354dd990ffbd90fd1da10eaec72aa87 (diff) | |
Merge branch 'msm-core' into for-next
* msm-core:
msm: serial: Add MSM8960 serial support
Diffstat (limited to 'arch/arm/mach-msm/Makefile')
| -rw-r--r-- | arch/arm/mach-msm/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-msm/Makefile b/arch/arm/mach-msm/Makefile index c7964417dae..ea8c74f56ea 100644 --- a/arch/arm/mach-msm/Makefile +++ b/arch/arm/mach-msm/Makefile @@ -27,7 +27,7 @@ obj-$(CONFIG_MACH_HALIBUT) += board-halibut.o devices-msm7x00.o 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_MSM8960) += board-msm8960.o devices-msm8960.o obj-$(CONFIG_ARCH_MSM7X30) += gpiomux-v1.o gpiomux.o obj-$(CONFIG_ARCH_QSD8X50) += gpiomux-8x50.o gpiomux-v1.o gpiomux.o |