diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-14 11:26:53 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-14 11:26:53 -0400 |
| commit | f81b691a3df09806385ea413c3a2ee094c705ca3 (patch) | |
| tree | 01c0d6d319fcbddc98171d06cfe8e742cd270455 /drivers/s390/block/dasd_eckd.h | |
| parent | 110e0358e7dfd9cc56d47077068f3680dae10b56 (diff) | |
| parent | adee14b2e1557d0a8559f29681732d05a89dfc35 (diff) | |
Merge commit 'v2.6.27-rc6' into x86/pat
Diffstat (limited to 'drivers/s390/block/dasd_eckd.h')
| -rw-r--r-- | drivers/s390/block/dasd_eckd.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/s390/block/dasd_eckd.h b/drivers/s390/block/dasd_eckd.h index 4bf0aa5112c1..2476f87d21d0 100644 --- a/drivers/s390/block/dasd_eckd.h +++ b/drivers/s390/block/dasd_eckd.h | |||
| @@ -308,7 +308,7 @@ struct dasd_psf_prssd_data { | |||
| 308 | unsigned char flags; | 308 | unsigned char flags; |
| 309 | unsigned char reserved[4]; | 309 | unsigned char reserved[4]; |
| 310 | unsigned char suborder; | 310 | unsigned char suborder; |
| 311 | unsigned char varies[9]; | 311 | unsigned char varies[5]; |
| 312 | } __attribute__ ((packed)); | 312 | } __attribute__ ((packed)); |
| 313 | 313 | ||
| 314 | /* | 314 | /* |