Merge branch 'linux-2.6' into for-2.6.22

[powerpc.git] / drivers / scsi / ncr53c8xx.h

diff --git a/drivers/scsi/ncr53c8xx.h b/drivers/scsi/ncr53c8xx.h
index cb8b770..b39357d 100644 (file)
--- a/drivers/scsi/ncr53c8xx.h
+++ b/drivers/scsi/ncr53c8xx.h
@@ -218,7 +218,7 @@
 **     Same as option 1, but also deal with 
 **     misconfigured interrupts.
 **
-**     - Edge triggerred instead of level sensitive.
+**     - Edge triggered instead of level sensitive.
 **     - No interrupt line connected.
 **     - IRQ number misconfigured.
 **     
@@ -549,7 +549,7 @@ struct ncr_driver_setup {
 
 /*
 **     Initial setup.
-**     Can be overriden at startup by a command line.
+**     Can be overridden at startup by a command line.
 */
 #define SCSI_NCR_DRIVER_SETUP                  \
 {                                              \
@@ -1093,7 +1093,7 @@ struct scr_tblsel {
 **-----------------------------------------------------------
 **     On 810A, 860, 825A, 875, 895 and 896 chips the content 
 **     of SFBR register can be used as data (SCR_SFBR_DATA).
-**     The 896 has additionnal IO registers starting at 
+**     The 896 has additional IO registers starting at 
 **     offset 0x80. Bit 7 of register offset is stored in 
 **     bit 7 of the SCRIPTS instruction first DWORD.
 **-----------------------------------------------------------