Merge git://oss.sgi.com:8090/xfs/xfs-2.6

[linux-drm-fsl-dcu.git] / include / asm-s390 / cio.h

diff --git a/include/asm-s390/cio.h b/include/asm-s390/cio.h
index da063cd5f0a006cbb5568d5d0261cbd931cdc446..d927850309800b2bcb64762639ab3834e0c3296b 100644 (file)
--- a/include/asm-s390/cio.h
+++ b/include/asm-s390/cio.h
@@ -275,14 +275,19 @@ struct ccw_dev_id {
        u16 devno;
 };
 
+static inline int ccw_dev_id_is_equal(struct ccw_dev_id *dev_id1,
+                                     struct ccw_dev_id *dev_id2)
+{
+       if ((dev_id1->ssid == dev_id2->ssid) &&
+           (dev_id1->devno == dev_id2->devno))
+               return 1;
+       return 0;
+}
+
 extern int diag210(struct diag210 *addr);
 
 extern void wait_cons_dev(void);
 
-extern void clear_all_subchannels(void);
-
-extern void cio_reset_channel_paths(void);
-
 extern void css_schedule_reprobe(void);
 
 extern void reipl_ccw_dev(struct ccw_dev_id *id);