diff options
| author | Rob Herring <robh@kernel.org> | 2014-05-14 03:34:35 +0400 |
|---|---|---|
| committer | Rob Herring <robh@kernel.org> | 2014-05-14 03:34:35 +0400 |
| commit | eafd370dfe487facfdef499057f4eac9aa0b4bf5 (patch) | |
| tree | 0925a67cd658cdf4811f49b4cd2073f663166bd0 /arch/s390/include/asm/ccwgroup.h | |
| parent | c3fc952d2fbe3ec78defd70cf73d5d76d27092ec (diff) | |
| parent | fb2caa50fbacd21719a90dd66b617ce3cb4fd6d7 (diff) | |
| download | linux-eafd370dfe487facfdef499057f4eac9aa0b4bf5.tar.xz | |
Merge branch 'dt-bus-name' into for-next
Diffstat (limited to 'arch/s390/include/asm/ccwgroup.h')
| -rw-r--r-- | arch/s390/include/asm/ccwgroup.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/include/asm/ccwgroup.h b/arch/s390/include/asm/ccwgroup.h index 6e670f88d125..ebc2913f9ee0 100644 --- a/arch/s390/include/asm/ccwgroup.h +++ b/arch/s390/include/asm/ccwgroup.h @@ -22,8 +22,8 @@ struct ccwgroup_device { /* public: */ unsigned int count; struct device dev; - struct ccw_device *cdev[0]; struct work_struct ungroup_work; + struct ccw_device *cdev[0]; }; /** |