diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-29 13:04:37 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-29 13:04:37 -0400 |
| commit | 3d963f5bb1949af53a37acf36d3b12e97ca9b1e5 (patch) | |
| tree | 9449490978cdb7858a7c713ee88f15ffc26a6d71 /drivers/net/ixgb/ixgb_hw.h | |
| parent | 5be1d85c208f135fc88f972f91b91a879b702b40 (diff) | |
| parent | e13934563db047043ccead26412f552375cea90c (diff) | |
Merge refs/heads/upstream from master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/ixgb/ixgb_hw.h')
| -rw-r--r-- | drivers/net/ixgb/ixgb_hw.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/net/ixgb/ixgb_hw.h b/drivers/net/ixgb/ixgb_hw.h index 97898efe7cc8..8bcf31ed10c2 100644 --- a/drivers/net/ixgb/ixgb_hw.h +++ b/drivers/net/ixgb/ixgb_hw.h | |||
| @@ -822,17 +822,8 @@ extern void ixgb_clear_vfta(struct ixgb_hw *hw); | |||
| 822 | 822 | ||
| 823 | /* Access functions to eeprom data */ | 823 | /* Access functions to eeprom data */ |
| 824 | void ixgb_get_ee_mac_addr(struct ixgb_hw *hw, uint8_t *mac_addr); | 824 | void ixgb_get_ee_mac_addr(struct ixgb_hw *hw, uint8_t *mac_addr); |
| 825 | uint16_t ixgb_get_ee_compatibility(struct ixgb_hw *hw); | ||
| 826 | uint32_t ixgb_get_ee_pba_number(struct ixgb_hw *hw); | 825 | uint32_t ixgb_get_ee_pba_number(struct ixgb_hw *hw); |
| 827 | uint16_t ixgb_get_ee_init_ctrl_reg_1(struct ixgb_hw *hw); | ||
| 828 | uint16_t ixgb_get_ee_init_ctrl_reg_2(struct ixgb_hw *hw); | ||
| 829 | uint16_t ixgb_get_ee_subsystem_id(struct ixgb_hw *hw); | ||
| 830 | uint16_t ixgb_get_ee_subvendor_id(struct ixgb_hw *hw); | ||
| 831 | uint16_t ixgb_get_ee_device_id(struct ixgb_hw *hw); | 826 | uint16_t ixgb_get_ee_device_id(struct ixgb_hw *hw); |
| 832 | uint16_t ixgb_get_ee_vendor_id(struct ixgb_hw *hw); | ||
| 833 | uint16_t ixgb_get_ee_swdpins_reg(struct ixgb_hw *hw); | ||
| 834 | uint8_t ixgb_get_ee_d3_power(struct ixgb_hw *hw); | ||
| 835 | uint8_t ixgb_get_ee_d0_power(struct ixgb_hw *hw); | ||
| 836 | boolean_t ixgb_get_eeprom_data(struct ixgb_hw *hw); | 827 | boolean_t ixgb_get_eeprom_data(struct ixgb_hw *hw); |
| 837 | uint16_t ixgb_get_eeprom_word(struct ixgb_hw *hw, uint16_t index); | 828 | uint16_t ixgb_get_eeprom_word(struct ixgb_hw *hw, uint16_t index); |
| 838 | 829 | ||