diff --git a/[refs] b/[refs] index 3da67f4f027b..dd5d8b55a26f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ed35ba9af4f40056a222dd7b67f39f1f6172185a +refs/heads/master: 8d4ecfcb6bd19c562e60f80f13cf222db5b4a073 diff --git a/trunk/arch/s390/include/asm/ccwgroup.h b/trunk/arch/s390/include/asm/ccwgroup.h index f2ef34f6d6e5..01a905eb11e0 100644 --- a/trunk/arch/s390/include/asm/ccwgroup.h +++ b/trunk/arch/s390/include/asm/ccwgroup.h @@ -6,14 +6,12 @@ struct ccw_driver; /** * struct ccwgroup_device - ccw group device - * @creator_id: unique number of the driver * @state: online/offline state * @count: number of attached slave devices * @dev: embedded device structure * @cdev: variable number of slave devices, allocated as needed */ struct ccwgroup_device { - unsigned long creator_id; enum { CCWGROUP_OFFLINE, CCWGROUP_ONLINE,