projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
gpio
/
Kconfig
diff --git
a/drivers/gpio/Kconfig
b/drivers/gpio/Kconfig
index 87d567089f13653297ddc001ec0fda8746254465..573c449c49b9138a69f8aaf9a999e8a41898d2e1 100644
(file)
--- a/
drivers/gpio/Kconfig
+++ b/
drivers/gpio/Kconfig
@@
-636,7
+636,7
@@
config GPIO_MAX7301
config GPIO_MCP23S08
tristate "Microchip MCP23xxx I/O expander"
- depends on
SPI_MASTER
|| I2C
+ depends on
(SPI_MASTER && !I2C)
|| I2C
help
SPI/I2C driver for Microchip MCP23S08/MCP23S17/MCP23008/MCP23017
I/O expanders.