diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/net/igb/e1000_mac.h | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/net/igb/e1000_mac.h')
| -rw-r--r-- | drivers/net/igb/e1000_mac.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/igb/e1000_mac.h b/drivers/net/igb/e1000_mac.h index bca17d882417..601be99711c2 100644 --- a/drivers/net/igb/e1000_mac.h +++ b/drivers/net/igb/e1000_mac.h | |||
| @@ -67,8 +67,6 @@ void igb_mta_set(struct e1000_hw *hw, u32 hash_value); | |||
| 67 | void igb_put_hw_semaphore(struct e1000_hw *hw); | 67 | void igb_put_hw_semaphore(struct e1000_hw *hw); |
| 68 | void igb_rar_set(struct e1000_hw *hw, u8 *addr, u32 index); | 68 | void igb_rar_set(struct e1000_hw *hw, u8 *addr, u32 index); |
| 69 | s32 igb_check_alt_mac_addr(struct e1000_hw *hw); | 69 | s32 igb_check_alt_mac_addr(struct e1000_hw *hw); |
| 70 | void igb_reset_adaptive(struct e1000_hw *hw); | ||
| 71 | void igb_update_adaptive(struct e1000_hw *hw); | ||
| 72 | 70 | ||
| 73 | bool igb_enable_mng_pass_thru(struct e1000_hw *hw); | 71 | bool igb_enable_mng_pass_thru(struct e1000_hw *hw); |
| 74 | 72 | ||