diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2011-08-01 10:16:05 -0400 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-08-01 10:16:05 -0400 |
| commit | 867f503d580eafbcc342141bae53cf6a27d413b1 (patch) | |
| tree | cae3f24edb3c309d0157f278d3bbe0d720f43997 /drivers/gpio/Kconfig | |
| parent | 5b8ce5eb81220b6329c467f76d1bfc9959dbfffc (diff) | |
| parent | 1a5ab4b3e6087726dfc00207b36c91d3061468e8 (diff) | |
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 | |||
| 103 | def_bool y | 103 | def_bool y |
| 104 | depends on PPC_MPC52xx | 104 | depends on PPC_MPC52xx |
| 105 | 105 | ||
| 106 | config GPIO_MSM_V1 | ||
| 107 | tristate "Qualcomm MSM GPIO v1" | ||
| 108 | depends on GPIOLIB && ARCH_MSM | ||
| 109 | help | ||
| 110 | Say yes here to support the GPIO interface on ARM v6 based | ||
| 111 | Qualcomm MSM chips. Most of the pins on the MSM can be | ||
| 112 | selected for GPIO, and are controlled by this driver. | ||
| 113 | |||
| 114 | config GPIO_MSM_V2 | ||
| 115 | tristate "Qualcomm MSM GPIO v2" | ||
| 116 | depends on GPIOLIB && ARCH_MSM | ||
| 117 | help | ||
| 118 | Say yes here to support the GPIO interface on ARM v7 based | ||
| 119 | Qualcomm MSM chips. Most of the pins on the MSM can be | ||
| 120 | selected for GPIO, and are controlled by this driver. | ||
| 121 | |||
| 106 | config GPIO_MXC | 122 | config GPIO_MXC |
| 107 | def_bool y | 123 | def_bool y |
| 108 | depends on ARCH_MXC | 124 | depends on ARCH_MXC |