diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-08-15 15:46:28 +0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-08-15 15:46:28 +0400 |
commit | 5aa37e4f0614e3b1f385426ce1e962e84c275bdf (patch) | |
tree | 3d8c30207989d09fde8ffb2c3c44c6b923d70062 /drivers/net/igb/e1000_hw.h | |
parent | d4c63ec060f3315653c0ae5bc3a7fe2419a2282f (diff) | |
parent | b76d69ed721e8365739c3bd5dd7891efbea88494 (diff) | |
download | linux-5aa37e4f0614e3b1f385426ce1e962e84c275bdf.tar.xz |
Merge branch 'x86/core' into x86/apic
Diffstat (limited to 'drivers/net/igb/e1000_hw.h')
-rw-r--r-- | drivers/net/igb/e1000_hw.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/igb/e1000_hw.h b/drivers/net/igb/e1000_hw.h index 19fa4ee96f2e..a65ccc3095c3 100644 --- a/drivers/net/igb/e1000_hw.h +++ b/drivers/net/igb/e1000_hw.h @@ -420,7 +420,6 @@ struct e1000_mac_operations { void (*rar_set)(struct e1000_hw *, u8 *, u32); s32 (*read_mac_addr)(struct e1000_hw *); s32 (*get_speed_and_duplex)(struct e1000_hw *, u16 *, u16 *); - void (*mta_set)(struct e1000_hw *, u32); }; struct e1000_phy_operations { |