diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-05-31 00:57:05 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-05-31 00:57:05 -0400 |
| commit | 5bc65793cbf8da0d35f19ef025dda22887e79e80 (patch) | |
| tree | 8291998abd73055de6f487fafa174ee2a5d3afee /drivers/message/fusion/mptbase.h | |
| parent | 6edae708bf77e012d855a7e2c7766f211d234f4f (diff) | |
| parent | 3f0a6766e0cc5a577805732e5adb50a585c58175 (diff) | |
[SCSI] Merge up to linux-2.6 head
Conflicts:
drivers/scsi/jazz_esp.c
Same changes made by both SCSI and SPARC trees: problem with UTF-8
conversion in the copyright.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/message/fusion/mptbase.h')
| -rw-r--r-- | drivers/message/fusion/mptbase.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/message/fusion/mptbase.h b/drivers/message/fusion/mptbase.h index d25d3be8fcd2..165f81d16d00 100644 --- a/drivers/message/fusion/mptbase.h +++ b/drivers/message/fusion/mptbase.h | |||
| @@ -436,7 +436,7 @@ typedef struct _MPT_SAS_MGMT { | |||
| 436 | typedef struct _mpt_ioctl_events { | 436 | typedef struct _mpt_ioctl_events { |
| 437 | u32 event; /* Specified by define above */ | 437 | u32 event; /* Specified by define above */ |
| 438 | u32 eventContext; /* Index or counter */ | 438 | u32 eventContext; /* Index or counter */ |
| 439 | int data[2]; /* First 8 bytes of Event Data */ | 439 | u32 data[2]; /* First 8 bytes of Event Data */ |
| 440 | } MPT_IOCTL_EVENTS; | 440 | } MPT_IOCTL_EVENTS; |
| 441 | 441 | ||
| 442 | /* | 442 | /* |