diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-09 12:59:16 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-09 12:59:16 -0400 |
| commit | 5647ac0ad4f355817b788372a01cb293ed63bde4 (patch) | |
| tree | bb454ce9bf63f145c467e042cd2f5b3367c1a9aa /drivers/i2c/muxes/Kconfig | |
| parent | 1763e735b0a093a6747078b3bd101f079e576ab6 (diff) | |
| parent | f4c54050640e7afa4749875cf9b900d42db361c0 (diff) | |
Merge tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux
Pull removal of GENERIC_GPIO from Grant Likely:
"GENERIC_GPIO now synonymous with GPIOLIB. There are no longer any
valid cases for enableing GENERIC_GPIO without GPIOLIB, even though it
is possible to do so which has been causing confusion and breakage.
This branch does the work to completely eliminate GENERIC_GPIO."
* tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux:
gpio: update gpio Chinese documentation
Remove GENERIC_GPIO config option
Convert selectors of GENERIC_GPIO to GPIOLIB
blackfin: force use of gpiolib
m68k: coldfire: use gpiolib
mips: pnx833x: remove requirement for GENERIC_GPIO
openrisc: default GENERIC_GPIO to false
avr32: default GENERIC_GPIO to false
xtensa: remove explicit selection of GENERIC_GPIO
sh: replace CONFIG_GENERIC_GPIO by CONFIG_GPIOLIB
powerpc: remove redundant GENERIC_GPIO selection
unicore32: default GENERIC_GPIO to false
unicore32: remove unneeded select GENERIC_GPIO
arm: plat-orion: use GPIO driver on CONFIG_GPIOLIB
arm: remove redundant GENERIC_GPIO selection
mips: alchemy: require gpiolib
mips: txx9: change GENERIC_GPIO to GPIOLIB
mips: loongson: use GPIO driver on CONFIG_GPIOLIB
mips: remove redundant GENERIC_GPIO select
Diffstat (limited to 'drivers/i2c/muxes/Kconfig')
| -rw-r--r-- | drivers/i2c/muxes/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/i2c/muxes/Kconfig b/drivers/i2c/muxes/Kconfig index 5faf244d2476..f7f9865b8b89 100644 --- a/drivers/i2c/muxes/Kconfig +++ b/drivers/i2c/muxes/Kconfig | |||
| @@ -7,7 +7,7 @@ menu "Multiplexer I2C Chip support" | |||
| 7 | 7 | ||
| 8 | config I2C_ARB_GPIO_CHALLENGE | 8 | config I2C_ARB_GPIO_CHALLENGE |
| 9 | tristate "GPIO-based I2C arbitration" | 9 | tristate "GPIO-based I2C arbitration" |
| 10 | depends on GENERIC_GPIO && OF | 10 | depends on GPIOLIB && OF |
| 11 | help | 11 | help |
| 12 | If you say yes to this option, support will be included for an | 12 | If you say yes to this option, support will be included for an |
| 13 | I2C multimaster arbitration scheme using GPIOs and a challenge & | 13 | I2C multimaster arbitration scheme using GPIOs and a challenge & |
| @@ -19,7 +19,7 @@ config I2C_ARB_GPIO_CHALLENGE | |||
| 19 | 19 | ||
| 20 | config I2C_MUX_GPIO | 20 | config I2C_MUX_GPIO |
| 21 | tristate "GPIO-based I2C multiplexer" | 21 | tristate "GPIO-based I2C multiplexer" |
| 22 | depends on GENERIC_GPIO | 22 | depends on GPIOLIB |
| 23 | help | 23 | help |
| 24 | If you say yes to this option, support will be included for a | 24 | If you say yes to this option, support will be included for a |
| 25 | GPIO based I2C multiplexer. This driver provides access to | 25 | GPIO based I2C multiplexer. This driver provides access to |