Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...

[pandora-kernel.git] / Documentation / sparc / sbus_drivers.txt

diff --git a/Documentation/sparc/sbus_drivers.txt b/Documentation/sparc/sbus_drivers.txt
index 4b93516..eb1e28a 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)
        {
@@ -67,10 +67,12 @@ probe in an SBUS driverunder Linux:
        MODULE_DEVICE_TABLE(of, mydevice_match);
 
        static struct of_platform_driver mydevice_driver = {
-               .name           = "mydevice",
                .match_table    = mydevice_match,
                .probe          = mydevice_probe,
                .remove         = __devexit_p(mydevice_remove),
+               .driver         = {
+                       .name           = "mydevice",
+               },
        };
 
        static int __init mydevice_init(void)
@@ -98,7 +100,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