diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-27 18:34:57 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-27 18:34:57 -0400 |
commit | f00546363fff1576ceddc2690d47e5f9c1dd2e05 (patch) | |
tree | f6cb8965b6754fc6ce7570cf1471ebe9874e509a /drivers/mtd/chips/Kconfig | |
parent | 50f732ee63b91eb08a29974b36bd63e1150bb642 (diff) | |
parent | 28b57cddb3ed4f7999e4b76ef36ebaaf6e2e0c37 (diff) |
Merge git://git.infradead.org/mtd-2.6
* git://git.infradead.org/mtd-2.6: (46 commits)
[MTD] [MAPS] drivers/mtd/maps/ck804xrom.c: convert pci_module_init()
[MTD] [NAND] CM-x270 MTD driver
[MTD] [NAND] Wrong calculation of page number in nand_block_bad()
[MTD] [MAPS] fix plat-ram printk format
[JFFS2] Fix compr_rubin.c build after include file elimination.
[JFFS2] Handle inodes with only a single metadata node with non-zero isize
[JFFS2] Tidy up licensing/copyright boilerplate.
[MTD] [OneNAND] Exit loop only when column start with 0
[MTD] [OneNAND] Fix access the past of the real oobfree array
[MTD] [OneNAND] Update Samsung OneNAND official URL
[JFFS2] Better fix for all-zero node headers
[JFFS2] Improve read_inode memory usage, v2.
[JFFS2] Improve failure mode if inode checking leaves unchecked space.
[JFFS2] Fix cross-endian build.
[MTD] Finish conversion mtd_blkdevs to use the kthread API
[JFFS2] Obsolete dirent nodes immediately on unlink, where possible.
Use menuconfig objects: MTD
[MTD] mtd_blkdevs: Convert to use the kthread API
[MTD] Fix fwh_lock locking
[JFFS2] Speed up mount for directly-mapped NOR flash
...
Diffstat (limited to 'drivers/mtd/chips/Kconfig')
-rw-r--r-- | drivers/mtd/chips/Kconfig | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/drivers/mtd/chips/Kconfig b/drivers/mtd/chips/Kconfig index 72e6d73beb40..d28e0fc85e12 100644 --- a/drivers/mtd/chips/Kconfig +++ b/drivers/mtd/chips/Kconfig | |||
@@ -6,7 +6,6 @@ menu "RAM/ROM/Flash chip drivers" | |||
6 | 6 | ||
7 | config MTD_CFI | 7 | config MTD_CFI |
8 | tristate "Detect flash chips by Common Flash Interface (CFI) probe" | 8 | tristate "Detect flash chips by Common Flash Interface (CFI) probe" |
9 | depends on MTD | ||
10 | select MTD_GEN_PROBE | 9 | select MTD_GEN_PROBE |
11 | help | 10 | help |
12 | The Common Flash Interface specification was developed by Intel, | 11 | The Common Flash Interface specification was developed by Intel, |
@@ -18,7 +17,6 @@ config MTD_CFI | |||
18 | 17 | ||
19 | config MTD_JEDECPROBE | 18 | config MTD_JEDECPROBE |
20 | tristate "Detect non-CFI AMD/JEDEC-compatible flash chips" | 19 | tristate "Detect non-CFI AMD/JEDEC-compatible flash chips" |
21 | depends on MTD | ||
22 | select MTD_GEN_PROBE | 20 | select MTD_GEN_PROBE |
23 | help | 21 | help |
24 | This option enables JEDEC-style probing of flash chips which are not | 22 | This option enables JEDEC-style probing of flash chips which are not |
@@ -213,21 +211,18 @@ config MTD_CFI_UTIL | |||
213 | 211 | ||
214 | config MTD_RAM | 212 | config MTD_RAM |
215 | tristate "Support for RAM chips in bus mapping" | 213 | tristate "Support for RAM chips in bus mapping" |
216 | depends on MTD | ||
217 | help | 214 | help |
218 | This option enables basic support for RAM chips accessed through | 215 | This option enables basic support for RAM chips accessed through |
219 | a bus mapping driver. | 216 | a bus mapping driver. |
220 | 217 | ||
221 | config MTD_ROM | 218 | config MTD_ROM |
222 | tristate "Support for ROM chips in bus mapping" | 219 | tristate "Support for ROM chips in bus mapping" |
223 | depends on MTD | ||
224 | help | 220 | help |
225 | This option enables basic support for ROM chips accessed through | 221 | This option enables basic support for ROM chips accessed through |
226 | a bus mapping driver. | 222 | a bus mapping driver. |
227 | 223 | ||
228 | config MTD_ABSENT | 224 | config MTD_ABSENT |
229 | tristate "Support for absent chips in bus mapping" | 225 | tristate "Support for absent chips in bus mapping" |
230 | depends on MTD | ||
231 | help | 226 | help |
232 | This option enables support for a dummy probing driver used to | 227 | This option enables support for a dummy probing driver used to |
233 | allocated placeholder MTD devices on systems that have socketed | 228 | allocated placeholder MTD devices on systems that have socketed |
@@ -237,7 +232,6 @@ config MTD_ABSENT | |||
237 | with this driver will return -ENODEV upon access. | 232 | with this driver will return -ENODEV upon access. |
238 | 233 | ||
239 | config MTD_OBSOLETE_CHIPS | 234 | config MTD_OBSOLETE_CHIPS |
240 | depends on MTD | ||
241 | bool "Older (theoretically obsoleted now) drivers for non-CFI chips" | 235 | bool "Older (theoretically obsoleted now) drivers for non-CFI chips" |
242 | help | 236 | help |
243 | This option does not enable any code directly, but will allow you to | 237 | This option does not enable any code directly, but will allow you to |
@@ -250,7 +244,7 @@ config MTD_OBSOLETE_CHIPS | |||
250 | 244 | ||
251 | config MTD_AMDSTD | 245 | config MTD_AMDSTD |
252 | tristate "AMD compatible flash chip support (non-CFI)" | 246 | tristate "AMD compatible flash chip support (non-CFI)" |
253 | depends on MTD && MTD_OBSOLETE_CHIPS && BROKEN | 247 | depends on MTD_OBSOLETE_CHIPS && BROKEN |
254 | help | 248 | help |
255 | This option enables support for flash chips using AMD-compatible | 249 | This option enables support for flash chips using AMD-compatible |
256 | commands, including some which are not CFI-compatible and hence | 250 | commands, including some which are not CFI-compatible and hence |
@@ -260,7 +254,7 @@ config MTD_AMDSTD | |||
260 | 254 | ||
261 | config MTD_SHARP | 255 | config MTD_SHARP |
262 | tristate "pre-CFI Sharp chip support" | 256 | tristate "pre-CFI Sharp chip support" |
263 | depends on MTD && MTD_OBSOLETE_CHIPS | 257 | depends on MTD_OBSOLETE_CHIPS |
264 | help | 258 | help |
265 | This option enables support for flash chips using Sharp-compatible | 259 | This option enables support for flash chips using Sharp-compatible |
266 | commands, including some which are not CFI-compatible and hence | 260 | commands, including some which are not CFI-compatible and hence |
@@ -268,7 +262,7 @@ config MTD_SHARP | |||
268 | 262 | ||
269 | config MTD_JEDEC | 263 | config MTD_JEDEC |
270 | tristate "JEDEC device support" | 264 | tristate "JEDEC device support" |
271 | depends on MTD && MTD_OBSOLETE_CHIPS && BROKEN | 265 | depends on MTD_OBSOLETE_CHIPS && BROKEN |
272 | help | 266 | help |
273 | Enable older JEDEC flash interface devices for self | 267 | Enable older JEDEC flash interface devices for self |
274 | programming flash. It is commonly used in older AMD chips. It is | 268 | programming flash. It is commonly used in older AMD chips. It is |