diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2009-01-05 11:24:55 -0500 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2009-01-05 11:24:55 -0500 |
| commit | 572acc41274522b865440d0644d5f986e3c83755 (patch) | |
| tree | e1f6f2968299d35de6ef4ec04524f65d28342b1a /drivers/mtd/Kconfig | |
| parent | 60f26520e7bd4479dbebf77317c45fc2255ba2e8 (diff) | |
| parent | 9faa8153bef4d82395e6ff7f87cb7c457055007c (diff) | |
Merge branch 'master' of git://git.infradead.org/users/dedekind/mtd-tests-2.6
Conflicts:
drivers/mtd/Makefile
Diffstat (limited to 'drivers/mtd/Kconfig')
| -rw-r--r-- | drivers/mtd/Kconfig | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/mtd/Kconfig b/drivers/mtd/Kconfig index ad20dc3128b9..7d04fb9ddcaa 100644 --- a/drivers/mtd/Kconfig +++ b/drivers/mtd/Kconfig | |||
| @@ -45,6 +45,14 @@ config MTD_PARTITIONS | |||
| 45 | devices. Partitioning on NFTL 'devices' is a different - that's the | 45 | devices. Partitioning on NFTL 'devices' is a different - that's the |
| 46 | 'normal' form of partitioning used on a block device. | 46 | 'normal' form of partitioning used on a block device. |
| 47 | 47 | ||
| 48 | config MTD_TESTS | ||
| 49 | tristate "MTD tests support" | ||
| 50 | depends on m | ||
| 51 | help | ||
| 52 | This option includes various MTD tests into compilation. The tests | ||
| 53 | should normally be compiled as kernel modules. The modules perform | ||
| 54 | various checks and verifications when loaded. | ||
| 55 | |||
| 48 | config MTD_REDBOOT_PARTS | 56 | config MTD_REDBOOT_PARTS |
| 49 | tristate "RedBoot partition table parsing" | 57 | tristate "RedBoot partition table parsing" |
| 50 | depends on MTD_PARTITIONS | 58 | depends on MTD_PARTITIONS |