diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2011-08-01 16:16:05 +0200 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-08-01 16:16:05 +0200 |
| commit | 867f503d580eafbcc342141bae53cf6a27d413b1 (patch) | |
| tree | cae3f24edb3c309d0157f278d3bbe0d720f43997 /drivers/gpio/Kconfig | |
| parent | gpio: ab8500: fix MODULE_ALIAS for ab8500 (diff) | |
| parent | gpio_msm: Move Qualcomm MSM v2 gpio driver into drivers (diff) | |
| download | linux-867f503d580eafbcc342141bae53cf6a27d413b1.tar.xz linux-867f503d580eafbcc342141bae53cf6a27d413b1.zip | |
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/Kconfig | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig index 363498697c2c..4fe59742aa92 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 |