diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2011-08-01 14:16:05 (GMT) |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-08-01 14:16:05 (GMT) |
| commit | 867f503d580eafbcc342141bae53cf6a27d413b1 (patch) | |
| tree | cae3f24edb3c309d0157f278d3bbe0d720f43997 /arch/arm/mach-msm/Makefile | |
| parent | 5b8ce5eb81220b6329c467f76d1bfc9959dbfffc (diff) | |
| parent | 1a5ab4b3e6087726dfc00207b36c91d3061468e8 (diff) | |
| download | linux-867f503d580eafbcc342141bae53cf6a27d413b1.tar.xz | |
Merge branch 'msm-move-gpio' of git://codeaurora.org/quic/kernel/davidb/linux-msm into gpio/next
Conflicts:
drivers/gpio/Kconfig
drivers/gpio/Makefile
Diffstat (limited to 'arch/arm/mach-msm/Makefile')
| -rw-r--r-- | arch/arm/mach-msm/Makefile | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/arm/mach-msm/Makefile b/arch/arm/mach-msm/Makefile index b70658c..4285dfd 100644 --- a/arch/arm/mach-msm/Makefile +++ b/arch/arm/mach-msm/Makefile @@ -29,11 +29,3 @@ 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 obj-$(CONFIG_ARCH_MSM8X60) += gpiomux-8x60.o gpiomux-v2.o gpiomux.o -ifdef CONFIG_MSM_V2_TLMM -ifndef CONFIG_ARCH_MSM8960 -# TODO: TLMM Mapping issues need to be resolved -obj-y += gpio-v2.o -endif -else -obj-y += gpio.o -endif |