diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-06 17:33:32 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-06 17:33:32 -0500 |
| commit | 404a02cbd2ae8bf256a2fa1169bdfe86bb5ebb34 (patch) | |
| tree | 99119edc53fdca73ed7586829b8ee736e09440b3 /drivers/gpio/Kconfig | |
| parent | 28cdac6690cb113856293bf79b40de33dbd8f974 (diff) | |
| parent | 1051b9f0f9eab8091fe3bf98320741adf36b4cfa (diff) | |
Merge branch 'devel-stable' into devel
Conflicts:
arch/arm/mach-pxa/clock.c
arch/arm/mach-pxa/clock.h
Diffstat (limited to 'drivers/gpio/Kconfig')
| -rw-r--r-- | drivers/gpio/Kconfig | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig index 3143ac795eb0..082495bb08a7 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig | |||
| @@ -230,11 +230,11 @@ config GPIO_STMPE | |||
| 230 | This enables support for the GPIOs found on the STMPE I/O | 230 | This enables support for the GPIOs found on the STMPE I/O |
| 231 | Expanders. | 231 | Expanders. |
| 232 | 232 | ||
| 233 | config GPIO_TC35892 | 233 | config GPIO_TC3589X |
| 234 | bool "TC35892 GPIOs" | 234 | bool "TC3589X GPIOs" |
| 235 | depends on MFD_TC35892 | 235 | depends on MFD_TC3589X |
| 236 | help | 236 | help |
| 237 | This enables support for the GPIOs found on the TC35892 | 237 | This enables support for the GPIOs found on the TC3589X |
| 238 | I/O Expander. | 238 | I/O Expander. |
| 239 | 239 | ||
| 240 | config GPIO_TWL4030 | 240 | config GPIO_TWL4030 |