From 57bd669a415fb62c9d8983320eaaa100522b0c34 Mon Sep 17 00:00:00 2001
From: NeilBrown <neilb@suse.de>
Date: Thu, 2 Aug 2012 08:35:43 +1000
Subject: [PATCH] --- yaml --- r: 321215 b: refs/heads/master c:
 d9f691c365a83ce2530f0e46b947365c2db44ea0 h: refs/heads/master i:   321213:
 d9da115646651712cbeaaeaeef500603bbbe7375   321211:
 5bf35ec22872986ef0a3782b33f45b655ccf9afc   321207:
 24533a5839052a9b3924688f9ad6200e8850e524   321199:
 b1a3badd306a91e2d6729dff6196fbbeb103601a   321183:
 5ac2b2f18aa345b2c39ebb85df4d7b2179e8e4cf   321151:
 aa8baef48684dbb24a0ae200efa8492aedbdc318 v: v3

---
 [refs]                   | 2 +-
 trunk/drivers/md/Kconfig | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index e2754098ee88..2efcfa31b3ba 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f54a9d0e59c4bea3db733921ca9147612a6f292c
+refs/heads/master: d9f691c365a83ce2530f0e46b947365c2db44ea0
diff --git a/trunk/drivers/md/Kconfig b/trunk/drivers/md/Kconfig
index 10f122a3a856..1de441a6c55f 100644
--- a/trunk/drivers/md/Kconfig
+++ b/trunk/drivers/md/Kconfig
@@ -277,13 +277,14 @@ config DM_MIRROR
          needed for live data migration tools such as 'pvmove'.
 
 config DM_RAID
-       tristate "RAID 1/4/5/6 target"
+       tristate "RAID 1/4/5/6/10 target"
        depends on BLK_DEV_DM
        select MD_RAID1
+       select MD_RAID10
        select MD_RAID456
        select BLK_DEV_MD
        ---help---
-	 A dm target that supports RAID1, RAID4, RAID5 and RAID6 mappings
+	 A dm target that supports RAID1, RAID10, RAID4, RAID5 and RAID6 mappings
 
 	 A RAID-5 set of N drives with a capacity of C MB per drive provides
 	 the capacity of C * (N - 1) MB, and protects against a failure