Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

[sfrench/cifs-2.6.git] / Documentation / eisa.txt

diff --git a/Documentation/eisa.txt b/Documentation/eisa.txt
index e00fd0c5707fb217e7848b797e1bff4449fec64f..60e361ba08c05ce491fd34a2eb73bc3194ca8c75 100644 (file)
--- a/Documentation/eisa.txt
+++ b/Documentation/eisa.txt
@@ -62,7 +62,7 @@ res           : root device I/O resource
 bus_base_addr : slot 0 address on this bus
 slots        : max slot number to probe
 force_probe   : Probe even when slot 0 is empty (no EISA mainboard)
-dma_mask      : Default DMA mask. Usualy the bridge device dma_mask.
+dma_mask      : Default DMA mask. Usually the bridge device dma_mask.
 bus_nr       : unique bus id, set by eisa_root_register
 
 ** Driver :
@@ -84,7 +84,7 @@ struct eisa_driver {
 
 id_table       : an array of NULL terminated EISA id strings,
                  followed by an empty string. Each string can
-                 optionnaly be paired with a driver-dependant value
+                 optionally be paired with a driver-dependant value
                  (driver_data).
 
 driver         : a generic driver, such as described in