From b4c5223751994316edee365e648e0cf641f7e3cb Mon Sep 17 00:00:00 2001
From: Cornelia Huck <cornelia.huck@de.ibm.com>
Date: Fri, 14 Dec 2012 17:02:17 +0100
Subject: [PATCH] --- yaml --- r: 356797 b: refs/heads/master c:
 0abbe448eddb2263db3fb776757f480b34accd88 h: refs/heads/master i:   356795:
 ef33baa66391a8d530a941c2286fe5be112a59c1 v: v3

---
 [refs]                               | 2 +-
 trunk/arch/s390/include/asm/ccwdev.h | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 8e0bf126516a..542eb0e2524f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 55c171a6d90dc0574021f9c836127cfd1a7d2e30
+refs/heads/master: 0abbe448eddb2263db3fb776757f480b34accd88
diff --git a/trunk/arch/s390/include/asm/ccwdev.h b/trunk/arch/s390/include/asm/ccwdev.h
index 6d1f3573f0df..e6061617a50b 100644
--- 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 */