---

yaml --- r: 346841 b: refs/heads/master c: 1f1c961 h: refs/heads/master i: 346839: 1016bb7 v: v3
git-mirror · Dec 17, 2012 · c8ebf29 · c8ebf29
1 parent 4371d0d
commit c8ebf29
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d0b0885316ab7a97cc8a19027905de3ff7bd1e79
+refs/heads/master: 1f1c96102ff848778cd596e81bdbd45f81a40119
diff --git a/trunk/arch/s390/include/asm/ccwdev.h b/trunk/arch/s390/include/asm/ccwdev.h
@@ -12,15 +12,13 @@
 #include <linux/mod_devicetable.h>
 #include <asm/fcx.h>
 #include <asm/irq.h>
+#include <asm/schid.h>
 
 /* structs from asm/cio.h */
 struct irb;
 struct ccw1;
 struct ccw_dev_id;
 
-/* from asm/schid.h */
-struct subchannel_id;
-
 /* simplified initializers for struct ccw_device:
  * CCW_DEVICE and CCW_DEVICE_DEVTYPE initialize one
  * entry in your MODULE_DEVICE_TABLE and set the match_flag correctly */