diff options
| author | David Vrabel <david.vrabel@csr.com> | 2009-01-02 08:17:13 -0500 |
|---|---|---|
| committer | David Vrabel <david.vrabel@csr.com> | 2009-01-02 08:17:13 -0500 |
| commit | b21a207141d83a06abc5f492b80204602e02ca44 (patch) | |
| tree | f0152cde543008c72d7eb5c12c18095ad92785e6 /Documentation/networking/driver.txt | |
| parent | 3af373021fa32f8f787bfbdcc1a9277a287bde4e (diff) | |
| parent | b58602a4bac012b5f4fc12fe6b46ab237b610d5d (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream
Conflicts:
drivers/uwb/wlp/eda.c
Diffstat (limited to 'Documentation/networking/driver.txt')
| -rw-r--r-- | Documentation/networking/driver.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/networking/driver.txt b/Documentation/networking/driver.txt index ea72d2e66ca8..03283daa64fe 100644 --- a/Documentation/networking/driver.txt +++ b/Documentation/networking/driver.txt | |||
| @@ -13,7 +13,7 @@ Transmit path guidelines: | |||
| 13 | static int drv_hard_start_xmit(struct sk_buff *skb, | 13 | static int drv_hard_start_xmit(struct sk_buff *skb, |
| 14 | struct net_device *dev) | 14 | struct net_device *dev) |
| 15 | { | 15 | { |
| 16 | struct drv *dp = dev->priv; | 16 | struct drv *dp = netdev_priv(dev); |
| 17 | 17 | ||
| 18 | lock_tx(dp); | 18 | lock_tx(dp); |
| 19 | ... | 19 | ... |