diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-12-16 13:36:10 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-12-16 13:36:10 +1100 |
| commit | 65490f513d336f8171bec59f77137cdfff536be1 (patch) | |
| tree | a8fae6318a664ba7bf561de351f0c57131f450be /drivers/mtd/maps/Kconfig | |
| parent | 0bc51a0a56d793afbddf37057a135cfd061d11ee (diff) | |
| parent | caf0e8e028516253afce6e40c52f0c193a221f8a (diff) | |
Merge remote branch 'mtd/master'
Conflicts:
drivers/mtd/devices/m25p80.c
drivers/mtd/maps/pcmciamtd.c
drivers/mtd/nand/excite_nandflash.c
drivers/mtd/nand/pxa3xx_nand.c
kernel/printk.c
Diffstat (limited to 'drivers/mtd/maps/Kconfig')
| -rw-r--r-- | drivers/mtd/maps/Kconfig | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig index b57a950d706f..179618b212e2 100644 --- a/drivers/mtd/maps/Kconfig +++ b/drivers/mtd/maps/Kconfig @@ -353,12 +353,6 @@ config MTD_SA1100 the SA1100 and SA1110, including the Assabet and the Compaq iPAQ. If you have such a board, say 'Y'. -config MTD_IPAQ - tristate "CFI Flash device mapped on Compaq/HP iPAQ" - depends on IPAQ_HANDHELD && MTD_CFI - help - This provides a driver for the on-board flash of the iPAQ. - config MTD_DC21285 tristate "CFI Flash device mapped on DC21285 Footbridge" depends on MTD_CFI && ARCH_FOOTBRIDGE && MTD_COMPLEX_MAPPINGS |