Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee13...

[pandora-kernel.git] / Documentation / scsi / aic7xxx_old.txt

diff --git a/Documentation/scsi/aic7xxx_old.txt b/Documentation/scsi/aic7xxx_old.txt
index 79e5ac6..c92f447 100644 (file)
--- a/Documentation/scsi/aic7xxx_old.txt
+++ b/Documentation/scsi/aic7xxx_old.txt
@@ -102,7 +102,7 @@ linux-1.1.x and fairly stable since linux-1.2.x, and are also in FreeBSD
     The hardware RAID devices sold by Adaptec are *NOT* supported by this
     driver (and will people please stop emailing me about them, they are
     a totally separate beast from the bare SCSI controllers and this driver
-    can not be retrofitted in any sane manner to support the hardware RAID
+    cannot be retrofitted in any sane manner to support the hardware RAID
     features on those cards - Doug Ledford).
     
 
@@ -241,7 +241,7 @@ linux-1.1.x and fairly stable since linux-1.2.x, and are also in FreeBSD
         that instead of dumping the register contents on the card, this
        option dumps the contents of the sequencer program RAM.  This gives
        the ability to verify that the instructions downloaded to the
-       card's sequencer are indeed what they are suppossed to be.  Again,
+       card's sequencer are indeed what they are supposed to be.  Again,
        unless you have documentation to tell you how to interpret these
        numbers, then it is totally useless.
        
@@ -317,7 +317,7 @@ linux-1.1.x and fairly stable since linux-1.2.x, and are also in FreeBSD
        initial DEVCONFIG values for each of your aic7xxx controllers as
        they are listed, and also record what the machine is detecting as
        the proper termination on your controllers.  NOTE: the order in
-       which the initial DEVCONFIG values are printed out is not gauranteed
+       which the initial DEVCONFIG values are printed out is not guaranteed
        to be the same order as the SCSI controllers are registered.  The
        above option and this option both work on the order of the SCSI
        controllers as they are registered, so make sure you match the right