Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6

[linux-2.6] / Documentation / eisa.txt

diff --git a/Documentation/eisa.txt b/Documentation/eisa.txt
index e00fd0c5707fb217e7848b797e1bff4449fec64f..6a099edadd622f625e2606c9402916a227accf4e 100644 (file)
--- a/Documentation/eisa.txt
+++ b/Documentation/eisa.txt
@@ -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