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/mtd | |
| 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/mtd')
| -rw-r--r-- | drivers/mtd/maps/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/mtd/nand/Kconfig | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig index 3ed17c4d4358..c26938382f64 100644 --- a/drivers/mtd/maps/Kconfig +++ b/drivers/mtd/maps/Kconfig | |||
| @@ -419,7 +419,7 @@ config MTD_BFIN_ASYNC | |||
| 419 | 419 | ||
| 420 | config MTD_GPIO_ADDR | 420 | config MTD_GPIO_ADDR |
| 421 | tristate "GPIO-assisted Flash Chip Support" | 421 | tristate "GPIO-assisted Flash Chip Support" |
| 422 | depends on GENERIC_GPIO || GPIOLIB | 422 | depends on GPIOLIB |
| 423 | depends on MTD_COMPLEX_MAPPINGS | 423 | depends on MTD_COMPLEX_MAPPINGS |
| 424 | help | 424 | help |
| 425 | Map driver which allows flashes to be partially physically addressed | 425 | Map driver which allows flashes to be partially physically addressed |
diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig index 81bf5e52601e..5d54ad32697f 100644 --- a/drivers/mtd/nand/Kconfig +++ b/drivers/mtd/nand/Kconfig | |||
| @@ -89,7 +89,7 @@ config MTD_NAND_H1900 | |||
| 89 | 89 | ||
| 90 | config MTD_NAND_GPIO | 90 | config MTD_NAND_GPIO |
| 91 | tristate "GPIO NAND Flash driver" | 91 | tristate "GPIO NAND Flash driver" |
| 92 | depends on GENERIC_GPIO && ARM | 92 | depends on GPIOLIB && ARM |
| 93 | help | 93 | help |
| 94 | This enables a GPIO based NAND flash driver. | 94 | This enables a GPIO based NAND flash driver. |
| 95 | 95 | ||