diff --git a/[refs] b/[refs]
index 97fcab4c7678..0296fe96a0b6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 09252e77ed13b1b412329825bad5797fbdd5a5c8
+refs/heads/master: ce26a8532fd062ccd3f3c589a4be269a2dc20f00
diff --git a/trunk/include/asm-s390/cio.h b/trunk/include/asm-s390/cio.h
index cabd5bb74b5a..d92785030980 100644
--- a/trunk/include/asm-s390/cio.h
+++ b/trunk/include/asm-s390/cio.h
@@ -278,7 +278,10 @@ struct ccw_dev_id {
 static inline int ccw_dev_id_is_equal(struct ccw_dev_id *dev_id1,
 				      struct ccw_dev_id *dev_id2)
 {
-	return !memcmp(dev_id1, dev_id2, sizeof(struct ccw_dev_id));
+	if ((dev_id1->ssid == dev_id2->ssid) &&
+	    (dev_id1->devno == dev_id2->devno))
+		return 1;
+	return 0;
 }
 
 extern int diag210(struct diag210 *addr);