diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-06-10 14:47:26 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-06-10 14:47:26 -0400 |
| commit | f0cd91a68acdc9b49d7f6738b514a426da627649 (patch) | |
| tree | 8ad73564015794197583b094217ae0a71e71e753 /drivers/scsi/megaraid.c | |
| parent | 60eef25701d25e99c991dd0f4a9f3832a0c3ad3e (diff) | |
| parent | 128e6ced247cda88f96fa9f2e4ba8b2c4a681560 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'drivers/scsi/megaraid.c')
| -rw-r--r-- | drivers/scsi/megaraid.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/scsi/megaraid.c b/drivers/scsi/megaraid.c index d245717fee65..c33857e7b33b 100644 --- a/drivers/scsi/megaraid.c +++ b/drivers/scsi/megaraid.c | |||
| @@ -4471,7 +4471,6 @@ mega_internal_command(adapter_t *adapter, megacmd_t *mc, mega_passthru *pthru) | |||
| 4471 | { | 4471 | { |
| 4472 | Scsi_Cmnd *scmd; | 4472 | Scsi_Cmnd *scmd; |
| 4473 | struct scsi_device *sdev; | 4473 | struct scsi_device *sdev; |
| 4474 | unsigned long flags = 0; | ||
| 4475 | scb_t *scb; | 4474 | scb_t *scb; |
| 4476 | int rval; | 4475 | int rval; |
| 4477 | 4476 | ||