diff options
| author | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
| commit | d4ab4e6a23f805abb8fc3cc34525eec3788aeca1 (patch) | |
| tree | eefd82c155bc27469a85667d759cd90facf4a6e3 /drivers/scsi/osst.h | |
| parent | c0fa797ae6cd02ff87c0bfe0d509368a3b45640e (diff) | |
| parent | 96fd2d57b8252e16dfacf8941f7a74a6119197f5 (diff) | |
Merge branch 'master'; commit 'v2.6.39-rc3' into next
Diffstat (limited to 'drivers/scsi/osst.h')
| -rw-r--r-- | drivers/scsi/osst.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/osst.h b/drivers/scsi/osst.h index 11d26c57f3f8..b4fea98ba276 100644 --- a/drivers/scsi/osst.h +++ b/drivers/scsi/osst.h | |||
| @@ -413,7 +413,7 @@ typedef struct os_dat_s { | |||
| 413 | * AUX | 413 | * AUX |
| 414 | */ | 414 | */ |
| 415 | typedef struct os_aux_s { | 415 | typedef struct os_aux_s { |
| 416 | __be32 format_id; /* hardware compability AUX is based on */ | 416 | __be32 format_id; /* hardware compatibility AUX is based on */ |
| 417 | char application_sig[4]; /* driver used to write this media */ | 417 | char application_sig[4]; /* driver used to write this media */ |
| 418 | __be32 hdwr; /* reserved */ | 418 | __be32 hdwr; /* reserved */ |
| 419 | __be32 update_frame_cntr; /* for configuration frame */ | 419 | __be32 update_frame_cntr; /* for configuration frame */ |