diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/scsi/osst.h | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
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 */ |