Merge ../linus

[linux-drm-fsl-dcu.git] / Documentation / sparc / sbus_drivers.txt

diff --git a/Documentation/sparc/sbus_drivers.txt b/Documentation/sparc/sbus_drivers.txt
index 4b9351624f134ac0e51d398747a5e48e0e4faba4..8418d35484fc850b28ec0744a1b8aa4751d8d2b2 100644 (file)
--- a/Documentation/sparc/sbus_drivers.txt
+++ b/Documentation/sparc/sbus_drivers.txt
@@ -25,8 +25,8 @@ the bits necessary to run your device.  The most commonly
 used members of this structure, and their typical usage,
 will be detailed below.
 
-       Here is a piece of skeleton code for perofming a device
-probe in an SBUS driverunder Linux:
+       Here is a piece of skeleton code for performing a device
+probe in an SBUS driver under Linux:
 
        static int __devinit mydevice_probe_one(struct sbus_dev *sdev)
        {
@@ -98,7 +98,7 @@ in your .remove method.
 
        Any memory allocated, registers mapped, IRQs registered,
 etc. must be undone by your .remove method so that all resources
-of your device are relased by the time it returns.
+of your device are released by the time it returns.
 
        You should _NOT_ use the for_each_sbus(), for_each_sbusdev(),
 and for_all_sbusdev() interfaces.  They are deprecated, will be