diff options
author | Paul Mackerras <paulus@samba.org> | 2007-05-07 23:37:51 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-05-07 23:37:51 -0400 |
commit | 02bbc0f09c90cefdb2837605c96a66c5ce4ba2e1 (patch) | |
tree | 04ef573cd4de095c500c9fc3477f4278c0b36300 /drivers/s390/char/tape_3590.h | |
parent | 7487a2245b8841c77ba9db406cf99a483b9334e9 (diff) | |
parent | 5b94f675f57e4ff16c8fda09088d7480a84dcd91 (diff) |
Merge branch 'linux-2.6'
Diffstat (limited to 'drivers/s390/char/tape_3590.h')
-rw-r--r-- | drivers/s390/char/tape_3590.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/s390/char/tape_3590.h b/drivers/s390/char/tape_3590.h index aa5138807af1..4534055f1376 100644 --- a/drivers/s390/char/tape_3590.h +++ b/drivers/s390/char/tape_3590.h | |||
@@ -129,6 +129,10 @@ struct tape_3590_med_sense { | |||
129 | char pad2[116]; | 129 | char pad2[116]; |
130 | } __attribute__ ((packed)); | 130 | } __attribute__ ((packed)); |
131 | 131 | ||
132 | struct tape_3590_rdc_data { | ||
133 | char data[64]; | ||
134 | } __attribute__ ((packed)); | ||
135 | |||
132 | /* Datastructures for 3592 encryption support */ | 136 | /* Datastructures for 3592 encryption support */ |
133 | 137 | ||
134 | struct tape3592_kekl { | 138 | struct tape3592_kekl { |