From 2e5123f978e0baaa61cef2a2fd2e7dc09b265f6a Mon Sep 17 00:00:00 2001
From: "Ahmed S. Darwish" <darwish.07@gmail.com>
Date: Mon, 12 Feb 2007 15:49:51 +0100
Subject: [PATCH] --- yaml --- r: 48092 b: refs/heads/master c:
 045236ab190636c989ae8198eca37cfbafc1430b h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/s390/cio/device_id.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 46287cd19d5d..15e60473b24e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4dd3cc5caf41d55cd5e55f32902c8a2ad3296e19
+refs/heads/master: 045236ab190636c989ae8198eca37cfbafc1430b
diff --git a/trunk/drivers/s390/cio/device_id.c b/trunk/drivers/s390/cio/device_id.c
index f17275917fe5..997f46874537 100644
--- a/trunk/drivers/s390/cio/device_id.c
+++ b/trunk/drivers/s390/cio/device_id.c
@@ -11,6 +11,7 @@
 
 #include <linux/module.h>
 #include <linux/init.h>
+#include <linux/kernel.h>
 
 #include <asm/ccwdev.h>
 #include <asm/delay.h>
@@ -138,7 +139,7 @@ VM_virtual_device_info (__u16 devno, struct senseid *ps)
 		ps->cu_model = 0x60;
 		return;
 	}
-	for (i = 0; i < sizeof(vm_devices) / sizeof(vm_devices[0]); i++)
+	for (i = 0; i < ARRAY_SIZE(vm_devices); i++)
 		if (diag_data.vrdcvcla == vm_devices[i].vrdcvcla &&
 		    diag_data.vrdcvtyp == vm_devices[i].vrdcvtyp) {
 			ps->cu_type = vm_devices[i].cu_type;