diff options
author | H. Peter Anvin <hpa@zytor.com> | 2009-12-11 19:57:42 +0100 |
---|---|---|
committer | H. Peter Anvin <hpa@zytor.com> | 2009-12-11 19:57:42 +0100 |
commit | 5c6baba84e1ac6a79b266b40e17e692aab6604a1 (patch) | |
tree | 6ba34db1109107023d753dd9fd5c359b3b990a04 /drivers/scsi/aic7xxx/aic7xxx.seq | |
parent | x86: Use find_e820() instead of hard coded trampoline address (diff) | |
parent | Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/air... (diff) | |
download | linux-5c6baba84e1ac6a79b266b40e17e692aab6604a1.tar.xz linux-5c6baba84e1ac6a79b266b40e17e692aab6604a1.zip |
Merge commit 'linus/master' into x86/urgent
Diffstat (limited to 'drivers/scsi/aic7xxx/aic7xxx.seq')
-rw-r--r-- | drivers/scsi/aic7xxx/aic7xxx.seq | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/aic7xxx/aic7xxx.seq b/drivers/scsi/aic7xxx/aic7xxx.seq index 15196390e28d..5a4cfc954a9f 100644 --- a/drivers/scsi/aic7xxx/aic7xxx.seq +++ b/drivers/scsi/aic7xxx/aic7xxx.seq @@ -1693,7 +1693,7 @@ if ((ahc->flags & AHC_INITIATORROLE) != 0) { * Is it a disconnect message? Set a flag in the SCB to remind us * and await the bus going free. If this is an untagged transaction * store the SCB id for it in our untagged target table for lookup on - * a reselction. + * a reselection. */ mesgin_disconnect: /* |