diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-03-01 17:19:05 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-03-01 17:19:05 -0500 |
| commit | d702d12167a2c05a346f49aac7a311d597762495 (patch) | |
| tree | baae42c299cce34d6df24b5d01f8b1d0b481bd9a /drivers/mtd/maps/Kconfig | |
| parent | 9418c65f9bd861d0f7e39aab9cfb3aa6f2275d11 (diff) | |
| parent | ac0f6f927db539e03e1f3f61bcd4ed57d5cde7a9 (diff) | |
Merge with mainline to remove plat-omap/Kconfig conflict
Conflicts:
arch/arm/plat-omap/Kconfig
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 9605cb87c74..aa2807d0ce7 100644 --- a/drivers/mtd/maps/Kconfig +++ b/drivers/mtd/maps/Kconfig | |||
| @@ -251,12 +251,6 @@ config MTD_NETtel | |||
| 251 | help | 251 | help |
| 252 | Support for flash chips on NETtel/SecureEdge/SnapGear boards. | 252 | Support for flash chips on NETtel/SecureEdge/SnapGear boards. |
| 253 | 253 | ||
| 254 | config MTD_ALCHEMY | ||
| 255 | tristate "AMD Alchemy Pb1xxx/Db1xxx/RDK MTD support" | ||
| 256 | depends on SOC_AU1X00 && MTD_PARTITIONS && MTD_CFI | ||
| 257 | help | ||
| 258 | Flash memory access on AMD Alchemy Pb/Db/RDK Reference Boards | ||
| 259 | |||
| 260 | config MTD_DILNETPC | 254 | config MTD_DILNETPC |
| 261 | tristate "CFI Flash device mapped on DIL/Net PC" | 255 | tristate "CFI Flash device mapped on DIL/Net PC" |
| 262 | depends on X86 && MTD_CONCAT && MTD_PARTITIONS && MTD_CFI_INTELEXT && BROKEN | 256 | depends on X86 && MTD_CONCAT && MTD_PARTITIONS && MTD_CFI_INTELEXT && BROKEN |