Merge branch 'field-zeroing' into for-linus

[pandora-kernel.git] / include / linux / raid_class.h

diff --git a/include/linux/raid_class.h b/include/linux/raid_class.h
index 48831ea..d22ad39 100644 (file)
--- a/include/linux/raid_class.h
+++ b/include/linux/raid_class.h
@@ -31,9 +31,11 @@ enum raid_level {
        RAID_LEVEL_LINEAR,
        RAID_LEVEL_0,
        RAID_LEVEL_1,
+       RAID_LEVEL_10,
        RAID_LEVEL_3,
        RAID_LEVEL_4,
        RAID_LEVEL_5,
+       RAID_LEVEL_50,
        RAID_LEVEL_6,
 };
 
@@ -75,5 +77,6 @@ DEFINE_RAID_ATTRIBUTE(enum raid_state, state)
 struct raid_template *raid_class_attach(struct raid_function_template *);
 void raid_class_release(struct raid_template *);
 
-void raid_component_add(struct raid_template *, struct device *,
-                       struct device *);
+int __must_check raid_component_add(struct raid_template *, struct device *,
+                                   struct device *);
+