diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-07-25 10:40:14 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-07-25 10:40:14 -0400 |
| commit | ff877ea80efa2015b6263766f78ee42c2a1b32f9 (patch) | |
| tree | 85205005c611ab774702148558321c6fb92f1ccd /drivers/mtd/maps/Kconfig | |
| parent | 30821fee4f0cb3e6d241d9f7ddc37742212e3eb7 (diff) | |
| parent | d37e6bf68fc1eb34a4ad21d9ae8890ed37ea80e7 (diff) | |
Merge branch 'linux-next' of git://git.infradead.org/~dedekind/ubi-2.6
Diffstat (limited to 'drivers/mtd/maps/Kconfig')
| -rw-r--r-- | drivers/mtd/maps/Kconfig | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig index ef1e29ea5a2c..df8e00bba07b 100644 --- a/drivers/mtd/maps/Kconfig +++ b/drivers/mtd/maps/Kconfig | |||
| @@ -257,13 +257,6 @@ config MTD_ALCHEMY | |||
| 257 | help | 257 | help |
| 258 | Flash memory access on AMD Alchemy Pb/Db/RDK Reference Boards | 258 | Flash memory access on AMD Alchemy Pb/Db/RDK Reference Boards |
| 259 | 259 | ||
| 260 | config MTD_MTX1 | ||
| 261 | tristate "4G Systems MTX-1 Flash device" | ||
| 262 | depends on MIPS_MTX1 && MTD_CFI | ||
| 263 | help | ||
| 264 | Flash memory access on 4G Systems MTX-1 Board. If you have one of | ||
| 265 | these boards and would like to use the flash chips on it, say 'Y'. | ||
| 266 | |||
| 267 | config MTD_DILNETPC | 260 | config MTD_DILNETPC |
| 268 | tristate "CFI Flash device mapped on DIL/Net PC" | 261 | tristate "CFI Flash device mapped on DIL/Net PC" |
| 269 | depends on X86 && MTD_CONCAT && MTD_PARTITIONS && MTD_CFI_INTELEXT | 262 | depends on X86 && MTD_CONCAT && MTD_PARTITIONS && MTD_CFI_INTELEXT |