aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-msm/Makefile
diff options
context:
space:
mode:
authorGregory Bean <gbean@codeaurora.org>2010-11-24 11:53:51 -0800
committerDaniel Walker <dwalker@codeaurora.org>2010-11-30 13:51:17 -0800
commit0cc2fc1f2f5f1fcf6699b43d73ca3e753ef63582 (patch)
tree9c64db8da8095fd0021497ad6196aec010464876 /arch/arm/mach-msm/Makefile
parent4916a1083290edfb6cc53aa134f00597447de1ce (diff)
downloadkernel_samsung_smdk4412-0cc2fc1f2f5f1fcf6699b43d73ca3e753ef63582.zip
kernel_samsung_smdk4412-0cc2fc1f2f5f1fcf6699b43d73ca3e753ef63582.tar.gz
kernel_samsung_smdk4412-0cc2fc1f2f5f1fcf6699b43d73ca3e753ef63582.tar.bz2
msm: gpio: Add v2 gpio support to MSM SoCs.
Beginning with the MSM8x60, the hardware block responsible for gpio support changes. Provide gpiolib support for the new v2 architecture. Cc: Baruch Siach <baruch@tkos.co.il> Cc: Pavan Kondeti <pkondeti@codeaurora.org> Signed-off-by: Gregory Bean <gbean@codeaurora.org> Signed-off-by: Daniel Walker <dwalker@codeaurora.org>
Diffstat (limited to 'arch/arm/mach-msm/Makefile')
-rw-r--r--arch/arm/mach-msm/Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-msm/Makefile b/arch/arm/mach-msm/Makefile
index b5a7b07..4a1a7ea 100644
--- a/arch/arm/mach-msm/Makefile
+++ b/arch/arm/mach-msm/Makefile
@@ -28,6 +28,8 @@ obj-$(CONFIG_ARCH_MSM8X60) += board-msm8x60.o
obj-$(CONFIG_ARCH_MSM7X30) += gpiomux-7x30.o 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
-ifndef CONFIG_MSM_V2_TLMM
+ifdef CONFIG_MSM_V2_TLMM
+obj-y += gpio-v2.o
+else
obj-y += gpio.o
endif