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

[mv-sheeva.git] / Documentation / networking / netdevices.txt

diff --git a/Documentation/networking/netdevices.txt b/Documentation/networking/netdevices.txt
index d0f71fc7f7829b1dfb9dfc689afe0978bec53c76..87b3d15f523ad49863d927801269efd1b5fb65de 100644 (file)
--- a/Documentation/networking/netdevices.txt
+++ b/Documentation/networking/netdevices.txt
@@ -18,7 +18,7 @@ There are routines in net_init.c to handle the common cases of
 alloc_etherdev, alloc_netdev.  These reserve extra space for driver
 private data which gets freed when the network device is freed. If
 separately allocated data is attached to the network device
-(dev->priv) then it is up to the module exit handler to free that.
+(netdev_priv(dev)) then it is up to the module exit handler to free that.
 
 MTU
 ===
@@ -74,7 +74,7 @@ dev->hard_start_xmit:
        for this and return NETDEV_TX_LOCKED when the spin lock fails.
        The locking there should also properly protect against 
        set_multicast_list. Note that the use of NETIF_F_LLTX is deprecated.
-       Dont use it for new drivers.
+       Don't use it for new drivers.
 
        Context: Process with BHs disabled or BH (timer),
                 will be called with interrupts disabled by netconsole.