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/busses/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/busses/Kconfig')
| -rw-r--r-- | drivers/i2c/busses/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig index adfee98486b1..631736e2e7ed 100644 --- a/drivers/i2c/busses/Kconfig +++ b/drivers/i2c/busses/Kconfig | |||
| @@ -363,7 +363,7 @@ config I2C_BLACKFIN_TWI_CLK_KHZ | |||
| 363 | 363 | ||
| 364 | config I2C_CBUS_GPIO | 364 | config I2C_CBUS_GPIO |
| 365 | tristate "CBUS I2C driver" | 365 | tristate "CBUS I2C driver" |
| 366 | depends on GENERIC_GPIO | 366 | depends on GPIOLIB |
| 367 | help | 367 | help |
| 368 | Support for CBUS access using I2C API. Mostly relevant for Nokia | 368 | Support for CBUS access using I2C API. Mostly relevant for Nokia |
| 369 | Internet Tablets (770, N800 and N810). | 369 | Internet Tablets (770, N800 and N810). |
| @@ -436,7 +436,7 @@ config I2C_EG20T | |||
| 436 | 436 | ||
| 437 | config I2C_GPIO | 437 | config I2C_GPIO |
| 438 | tristate "GPIO-based bitbanging I2C" | 438 | tristate "GPIO-based bitbanging I2C" |
| 439 | depends on GENERIC_GPIO | 439 | depends on GPIOLIB |
| 440 | select I2C_ALGOBIT | 440 | select I2C_ALGOBIT |
| 441 | help | 441 | help |
| 442 | This is a very simple bitbanging I2C driver utilizing the | 442 | This is a very simple bitbanging I2C driver utilizing the |