diff --git a/[refs] b/[refs]
index bb57dd828bf6..17ab1a3a7c9c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b770ffd4c453068392b16fda8afca548cd7ebe38
+refs/heads/master: 0e4a9d03df0a7ba516bbd94d2ec17d26859e46ba
diff --git a/trunk/drivers/block/cciss.c b/trunk/drivers/block/cciss.c
index 51ceaee98f9f..e1e7143ca1e3 100644
--- a/trunk/drivers/block/cciss.c
+++ b/trunk/drivers/block/cciss.c
@@ -335,7 +335,7 @@ static void cciss_map_sg_chain_block(ctlr_info_t *h, CommandList_struct *c,
 static const char *raid_label[] = { "0", "4", "1(1+0)", "5", "5+1", "ADG",
 	"UNKNOWN"
 };
-#define RAID_UNKNOWN (sizeof(raid_label) / sizeof(raid_label[0])-1)
+#define RAID_UNKNOWN (ARRAY_SIZE(raid_label)-1)
 
 #ifdef CONFIG_PROC_FS