Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 2 insertions, 0 deletions

diff --git a/drivers/misc/enclosure.c b/drivers/misc/enclosure.c
index e9eae4a78402..48c84a58163e 100644
--- a/drivers/misc/enclosure.c
+++ b/drivers/misc/enclosure.c
@@ -27,6 +27,7 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
+#include <linux/slab.h>
 
 static LIST_HEAD(container_list);
 static DEFINE_MUTEX(container_list_lock);
@@ -391,6 +392,7 @@ static const char *const enclosure_status [] = {
         [ENCLOSURE_STATUS_NOT_INSTALLED] = "not installed",
         [ENCLOSURE_STATUS_UNKNOWN] = "unknown",
         [ENCLOSURE_STATUS_UNAVAILABLE] = "unavailable",
+        [ENCLOSURE_STATUS_MAX] = NULL,
 };
 
 static const char *const enclosure_type [] = {