diff options
| author | Linus Torvalds | 2009-04-16 16:41:56 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2009-04-16 16:41:56 +0200 |
| commit | cd97824994042b809493807ea644ba26c0c23290 (patch) | |
| tree | 705d9d069130330d4d9d2a23cd9ff99ec8187f28 /drivers/net/igb/e1000_mac.h | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 (diff) | |
| parent | phylib: Fix delay argument of schedule_delayed_work (diff) | |
| download | kernel-qcow2-linux-cd97824994042b809493807ea644ba26c0c23290.tar.gz kernel-qcow2-linux-cd97824994042b809493807ea644ba26c0c23290.tar.xz kernel-qcow2-linux-cd97824994042b809493807ea644ba26c0c23290.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (64 commits)
phylib: Fix delay argument of schedule_delayed_work
NET/ixgbe: Fix powering off during shutdown
NET/e1000e: Fix powering off during shutdown
NET/e1000: Fix powering off during shutdown
packet: avoid warnings when high-order page allocation fails
gianfar: stop send queue before resetting gianfar
myr10ge: again fix lro_gen_skb() alignment
declance: convert to net_device_ops
bfin_mac: convert to net_device_ops
au1000: convert to net_device_ops
atarilance: convert to net_device_ops
a2065: convert to net_device_ops
ixgbe: update real_num_tx_queues on changing num_rx_queues
ixgbe: fix tx queue index
Revert "rose: zero length frame filtering in af_rose.c"
sfc: Use correct macro to set event bitfield
sfc: Match calls to netif_napi_add() and netif_napi_del()
bonding: Remove debug printk
e1000/e1000: fix compile warning
ehea: Fix incomplete conversion to net_device_ops
...
Diffstat (limited to 'drivers/net/igb/e1000_mac.h')
| -rw-r--r-- | drivers/net/igb/e1000_mac.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/igb/e1000_mac.h b/drivers/net/igb/e1000_mac.h index a34de5269637..1d690b4c9ae4 100644 --- a/drivers/net/igb/e1000_mac.h +++ b/drivers/net/igb/e1000_mac.h @@ -66,7 +66,6 @@ void igb_rar_set(struct e1000_hw *hw, u8 *addr, u32 index); s32 igb_check_alt_mac_addr(struct e1000_hw *hw); void igb_reset_adaptive(struct e1000_hw *hw); void igb_update_adaptive(struct e1000_hw *hw); -void igb_write_vfta(struct e1000_hw *hw, u32 offset, u32 value); bool igb_enable_mng_pass_thru(struct e1000_hw *hw); |