The following commit has been merged in the linux branch: commit 4397989fc91ed289909ecf307c2dc21cee0e7905 Merge: 1bbc9a66d0194449f32c2aa18be40db5744dbd85 de19d02b731478877ce8b1ccf371c2b2142ac80e Author: Linus Torvalds torvalds@linux-foundation.org Date: Thu Nov 5 13:23:16 2009 -0800
Merge git://git.infradead.org/users/dwmw2/mtd-2.6.32
* git://git.infradead.org/users/dwmw2/mtd-2.6.32: mtd/maps: gpio-addr-flash: depend on GPIO arch support mtd/maps: gpio-addr-flash: pull in linux/ headers rather than asm/ mtd: nand: fix htmldocs warnings
diff --combined drivers/mtd/maps/Kconfig index 841e085,0fc67a2..14be075 --- a/drivers/mtd/maps/Kconfig +++ b/drivers/mtd/maps/Kconfig @@@ -74,7 -74,7 +74,7 @@@ config MTD_PHYSMAP_BANKWIDT
config MTD_PHYSMAP_OF tristate "Flash device in physical memory map based on OF description" - depends on PPC_OF && (MTD_CFI || MTD_JEDECPROBE || MTD_ROM) + depends on (MICROBLAZE || PPC_OF) && (MTD_CFI || MTD_JEDECPROBE || MTD_ROM) help This provides a 'mapping' driver which allows the NOR Flash and ROM driver code to communicate with chips which are mapped @@@ -486,6 -486,7 +486,7 @@@ config MTD_BFIN_ASYN
config MTD_GPIO_ADDR tristate "GPIO-assisted Flash Chip Support" + depends on GENERIC_GPIO || GPIOLIB depends on MTD_COMPLEX_MAPPINGS select MTD_PARTITIONS help