diff options
| author | David Vrabel <david.vrabel@csr.com> | 2008-11-19 09:48:07 -0500 |
|---|---|---|
| committer | David Vrabel <david.vrabel@csr.com> | 2008-11-19 09:48:07 -0500 |
| commit | dba0a918722ee0f0ba3442575e4448c3ab622be4 (patch) | |
| tree | fdb466cf09e7916135098d651b18924b2fe9ba5f /include/linux/netdevice.h | |
| parent | 0996e6382482ce9014787693d3884e9468153a5c (diff) | |
| parent | 7f0f598a0069d1ab072375965a4b69137233169c (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream
Diffstat (limited to 'include/linux/netdevice.h')
| -rw-r--r-- | include/linux/netdevice.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index c8bcb59adfdf..9d77b1d7dca8 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h | |||
| @@ -1537,7 +1537,6 @@ static inline void __netif_tx_unlock_bh(struct netdev_queue *txq) | |||
| 1537 | /** | 1537 | /** |
| 1538 | * netif_tx_lock - grab network device transmit lock | 1538 | * netif_tx_lock - grab network device transmit lock |
| 1539 | * @dev: network device | 1539 | * @dev: network device |
| 1540 | * @cpu: cpu number of lock owner | ||
| 1541 | * | 1540 | * |
| 1542 | * Get network device transmit lock | 1541 | * Get network device transmit lock |
| 1543 | */ | 1542 | */ |