diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-26 16:28:47 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-26 16:28:47 -0400 |
commit | 2d986010ad13a00b83851238d52601d6092df40e (patch) | |
tree | 6a43ffd30290fc051435643d485ad12fb1448ed5 /drivers/scsi/aacraid/commctrl.c | |
parent | 6b6a93c6876ea1c530d5d3f68e3678093a27fab0 (diff) | |
parent | e10fb91c4dc81a4ae47caf0828df152f600f2546 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-for-linus-2.6
Diffstat (limited to 'drivers/scsi/aacraid/commctrl.c')
-rw-r--r-- | drivers/scsi/aacraid/commctrl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/aacraid/commctrl.c b/drivers/scsi/aacraid/commctrl.c index 390cd67c57c0..85387099aab2 100644 --- a/drivers/scsi/aacraid/commctrl.c +++ b/drivers/scsi/aacraid/commctrl.c | |||
@@ -517,7 +517,7 @@ static int aac_send_raw_srb(struct aac_dev* dev, void __user * arg) | |||
517 | } | 517 | } |
518 | if (dev->dac_support == 1) { | 518 | if (dev->dac_support == 1) { |
519 | struct user_sgmap64* upsg = (struct user_sgmap64*)&user_srbcmd->sg; | 519 | struct user_sgmap64* upsg = (struct user_sgmap64*)&user_srbcmd->sg; |
520 | struct sgmap64* psg = (struct sgmap64*)&user_srbcmd->sg; | 520 | struct sgmap64* psg = (struct sgmap64*)&srbcmd->sg; |
521 | struct user_sgmap* usg; | 521 | struct user_sgmap* usg; |
522 | byte_count = 0; | 522 | byte_count = 0; |
523 | 523 | ||