Merge tag 'driver-core-3.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux.git] / arch / s390 / include / asm / ccwgroup.h

diff --git a/arch/s390/include/asm/ccwgroup.h b/arch/s390/include/asm/ccwgroup.h
index 23723ce5ca7a9b0b68585eb2faa2f4cdcd6cabc9..6e670f88d125d79fd2108575a6f6509e74985678 100644 (file)
--- a/arch/s390/include/asm/ccwgroup.h
+++ b/arch/s390/include/asm/ccwgroup.h
@@ -23,6 +23,7 @@ struct ccwgroup_device {
        unsigned int count;
        struct device   dev;
        struct ccw_device *cdev[0];
+       struct work_struct ungroup_work;
 };
 
 /**