commit 867f503d580eafbcc342141bae53cf6a27d413b1
author Grant Likely <grant.likely@secretlab.ca> Mon Aug 01 15:16:05 2011 +0100
committer Grant Likely <grant.likely@secretlab.ca> Mon Aug 01 15:16:05 2011 +0100
tree cae3f24edb3c309d0157f278d3bbe0d720f43997
parent 5b8ce5eb81220b6329c467f76d1bfc9959dbfffc
parent 1a5ab4b3e6087726dfc00207b36c91d3061468e8

Merge branch 'msm-move-gpio' of git://codeaurora.org/quic/kernel/davidb/linux-msm into gpio/next

Conflicts:
	drivers/gpio/Kconfig
	drivers/gpio/Makefile

drivers/gpio/Makefile

diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile
index 7207112..a97f8f8 100644
--- a/drivers/gpio/Makefile
+++ b/drivers/gpio/Makefile
@@ -27,6 +27,8 @@
 obj-$(CONFIG_GPIO_MCP23S08)	+= gpio-mcp23s08.o
 obj-$(CONFIG_GPIO_ML_IOH)	+= gpio-ml-ioh.o
 obj-$(CONFIG_GPIO_MPC5200)	+= gpio-mpc5200.o
+obj-$(CONFIG_GPIO_MSM_V1)	+= gpio-msm-v1.o
+obj-$(CONFIG_GPIO_MSM_V2)	+= gpio-msm-v2.o
 obj-$(CONFIG_GPIO_MXC)		+= gpio-mxc.o
 obj-$(CONFIG_GPIO_MXS)		+= gpio-mxs.o
 obj-$(CONFIG_PLAT_NOMADIK)	+= gpio-nomadik.o