Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...

[~andy/linux] / Documentation / driver-model / driver.txt

diff --git a/Documentation/driver-model/driver.txt b/Documentation/driver-model/driver.txt
index 59806c9761f7bbbd2c6c03e08fb95bf57f342b7d..82132169d47a837fc55ea9d53555abc29b2c7b5d 100644 (file)
--- a/Documentation/driver-model/driver.txt
+++ b/Documentation/driver-model/driver.txt
@@ -178,7 +178,7 @@ the driver to that device.
 
 A driver's probe() may return a negative errno value to indicate that
 the driver did not bind to this device, in which case it should have
-released all reasources it allocated.
+released all resources it allocated.
 
        int     (*remove)       (struct device * dev);