diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-06-28 14:06:39 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-06-28 14:06:39 -0400 |
| commit | f28e71617ddaf2483e3e5c5237103484a303743f (patch) | |
| tree | 67627d2d8ddbf6a4449371e9261d796c013b1fa1 /drivers/mtd/Kconfig | |
| parent | dc6a78f1af10d28fb8c395034ae1e099b85c05b0 (diff) | |
| parent | a39727f212426b9d5f9267b3318a2afaf9922d3b (diff) | |
Merge ../linux-2.6/
Conflicts:
drivers/scsi/aacraid/comminit.c
Fixed up by removing the now renamed CONFIG_IOMMU option from
aacraid
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/mtd/Kconfig')
| -rw-r--r-- | drivers/mtd/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mtd/Kconfig b/drivers/mtd/Kconfig index 5ac265dde423..1344ad7a4b14 100644 --- a/drivers/mtd/Kconfig +++ b/drivers/mtd/Kconfig | |||
| @@ -86,14 +86,14 @@ config MTD_REDBOOT_DIRECTORY_BLOCK | |||
| 86 | block and "-2" means the penultimate block. | 86 | block and "-2" means the penultimate block. |
| 87 | 87 | ||
| 88 | config MTD_REDBOOT_PARTS_UNALLOCATED | 88 | config MTD_REDBOOT_PARTS_UNALLOCATED |
| 89 | bool " Include unallocated flash regions" | 89 | bool "Include unallocated flash regions" |
| 90 | depends on MTD_REDBOOT_PARTS | 90 | depends on MTD_REDBOOT_PARTS |
| 91 | help | 91 | help |
| 92 | If you need to register each unallocated flash region as a MTD | 92 | If you need to register each unallocated flash region as a MTD |
| 93 | 'partition', enable this option. | 93 | 'partition', enable this option. |
| 94 | 94 | ||
| 95 | config MTD_REDBOOT_PARTS_READONLY | 95 | config MTD_REDBOOT_PARTS_READONLY |
| 96 | bool " Force read-only for RedBoot system images" | 96 | bool "Force read-only for RedBoot system images" |
| 97 | depends on MTD_REDBOOT_PARTS | 97 | depends on MTD_REDBOOT_PARTS |
| 98 | help | 98 | help |
| 99 | If you need to force read-only for 'RedBoot', 'RedBoot Config' and | 99 | If you need to force read-only for 'RedBoot', 'RedBoot Config' and |