summaryrefslogtreecommitdiffstats
path: root/drivers/gpio/Kconfig
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2011-08-01 15:16:05 +0100
committerGrant Likely <grant.likely@secretlab.ca>2011-08-01 15:16:05 +0100
commit867f503d580eafbcc342141bae53cf6a27d413b1 (patch)
treecae3f24edb3c309d0157f278d3bbe0d720f43997 /drivers/gpio/Kconfig
parent5b8ce5eb81220b6329c467f76d1bfc9959dbfffc (diff)
parent1a5ab4b3e6087726dfc00207b36c91d3061468e8 (diff)
downloadop-kernel-dev-867f503d580eafbcc342141bae53cf6a27d413b1.zip
op-kernel-dev-867f503d580eafbcc342141bae53cf6a27d413b1.tar.gz
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 'drivers/gpio/Kconfig')
-rw-r--r--drivers/gpio/Kconfig16
1 files changed, 16 insertions, 0 deletions
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index 3634986..4fe5974 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -103,6 +103,22 @@ config GPIO_MPC5200
def_bool y
depends on PPC_MPC52xx
+config GPIO_MSM_V1
+ tristate "Qualcomm MSM GPIO v1"
+ depends on GPIOLIB && ARCH_MSM
+ help
+ Say yes here to support the GPIO interface on ARM v6 based
+ Qualcomm MSM chips. Most of the pins on the MSM can be
+ selected for GPIO, and are controlled by this driver.
+
+config GPIO_MSM_V2
+ tristate "Qualcomm MSM GPIO v2"
+ depends on GPIOLIB && ARCH_MSM
+ help
+ Say yes here to support the GPIO interface on ARM v7 based
+ Qualcomm MSM chips. Most of the pins on the MSM can be
+ selected for GPIO, and are controlled by this driver.
+
config GPIO_MXC
def_bool y
depends on ARCH_MXC
OpenPOWER on IntegriCloud