diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-05-23 19:52:55 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-05-23 19:52:55 -0400 |
| commit | 1f782fee18b39b9ad438ebbd82c2915a16c879ee (patch) | |
| tree | f292930065e6c860714c134790ab8882680ac739 /drivers/md/Kconfig | |
| parent | 8eda2f21ed9c936a54fd7bc16cbfa5ee656635c2 (diff) | |
| parent | f4b87dee923342505e1ddba8d34ce9de33e75050 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/md/Kconfig')
| -rw-r--r-- | drivers/md/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/md/Kconfig b/drivers/md/Kconfig index acb3a4e404ff..4a6feac8c94a 100644 --- a/drivers/md/Kconfig +++ b/drivers/md/Kconfig | |||
| @@ -100,8 +100,8 @@ config MD_RAID1 | |||
| 100 | If unsure, say Y. | 100 | If unsure, say Y. |
| 101 | 101 | ||
| 102 | config MD_RAID10 | 102 | config MD_RAID10 |
| 103 | tristate "RAID-10 (mirrored striping) mode (EXPERIMENTAL)" | 103 | tristate "RAID-10 (mirrored striping) mode" |
| 104 | depends on BLK_DEV_MD && EXPERIMENTAL | 104 | depends on BLK_DEV_MD |
| 105 | ---help--- | 105 | ---help--- |
| 106 | RAID-10 provides a combination of striping (RAID-0) and | 106 | RAID-10 provides a combination of striping (RAID-0) and |
| 107 | mirroring (RAID-1) with easier configuration and more flexible | 107 | mirroring (RAID-1) with easier configuration and more flexible |