git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
drivers
/
gpio
/
Kconfig
diff --git
a/drivers/gpio/Kconfig
b/drivers/gpio/Kconfig
index
47eae6e
..
3634986
100644
(file)
--- a/
drivers/gpio/Kconfig
+++ b/
drivers/gpio/Kconfig
@@
-412,10
+412,11
@@
config GPIO_MAX7301
GPIO driver for Maxim MAX7301 SPI-based GPIO expander.
config GPIO_MCP23S08
GPIO driver for Maxim MAX7301 SPI-based GPIO expander.
config GPIO_MCP23S08
- tristate "Microchip MCP23
S
xx I/O expander"
- depends on SPI_MASTER
+ tristate "Microchip MCP23
x
xx I/O expander"
+ depends on SPI_MASTER
|| I2C
help
help
- SPI driver for Microchip MCP23S08/MPC23S17 I/O expanders.
+ SPI/I2C driver for Microchip MCP23S08/MCP23S17/MCP23008/MCP23017
+ I/O expanders.
This provides a GPIO interface supporting inputs and outputs.
config GPIO_MC33880
This provides a GPIO interface supporting inputs and outputs.
config GPIO_MC33880