Merge master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6-omap-h63xx.git] / drivers / scsi / raid_class.c

diff --git a/drivers/scsi/raid_class.c b/drivers/scsi/raid_class.c
index a9f99c68556f0cdeff85d1d6bab5e0999028591d..50c398aab5575305fc725f4e8e8b819b3abfce37 100644 (file)
--- a/drivers/scsi/raid_class.c
+++ b/drivers/scsi/raid_class.c
@@ -12,6 +12,8 @@
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/list.h>
+#include <linux/slab.h>
+#include <linux/string.h>
 #include <linux/raid_class.h>
 #include <scsi/scsi_device.h>
 #include <scsi/scsi_host.h>
@@ -113,7 +115,7 @@ static DECLARE_TRANSPORT_CLASS(raid_class,
                               raid_remove,
                               NULL);
 
-static struct {
+static const struct {
        enum raid_state value;
        char            *name;
 } raid_states[] = {
@@ -146,9 +148,11 @@ static struct {
        { RAID_LEVEL_LINEAR, "linear" },
        { RAID_LEVEL_0, "raid0" },
        { RAID_LEVEL_1, "raid1" },
+       { RAID_LEVEL_10, "raid10" },
        { RAID_LEVEL_3, "raid3" },
        { RAID_LEVEL_4, "raid4" },
        { RAID_LEVEL_5, "raid5" },
+       { RAID_LEVEL_50, "raid50" },
        { RAID_LEVEL_6, "raid6" },
 };