diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-23 02:55:47 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-23 02:55:47 -0500 |
| commit | ca9eed76133c00e7f4b1eeb4c1a6cb800cd2654c (patch) | |
| tree | 5f011f4bd00c921e41605b1915c227aeaf411a0d /include/linux/netdevice.h | |
| parent | 8652cb4b0d87accbe78725fd2a13be2787059649 (diff) | |
| parent | 13d428afc007fcfcd6deeb215618f54cf9c0cae6 (diff) | |
Merge commit 'v2.6.28-rc6' into x86/debug
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 | */ |