Merge branches 'doc', 'multitouch', 'upstream' and 'upstream-fixes' into for-linus

[pandora-kernel.git] / Documentation / eisa.txt

diff --git a/Documentation/eisa.txt b/Documentation/eisa.txt
index 60e361b..38cf0c7 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
-                 optionally be paired with a driver-dependant value
+                 optionally be paired with a driver-dependent value
                  (driver_data).
 
 driver         : a generic driver, such as described in
@@ -171,7 +171,7 @@ device.
 virtual_root.force_probe :
 
 Force the probing code to probe EISA slots even when it cannot find an
-EISA compliant mainboard (nothing appears on slot 0). Defaultd to 0
+EISA compliant mainboard (nothing appears on slot 0). Defaults to 0
 (don't force), and set to 1 (force probing) when either
 CONFIG_ALPHA_JENSEN or CONFIG_EISA_VLB_PRIMING are set.