Pull bugzilla-9194 into release branch

[linux-2.6-omap-h63xx.git] / drivers / net / ixgb / ixgb_hw.h

diff --git a/drivers/net/ixgb/ixgb_hw.h b/drivers/net/ixgb/ixgb_hw.h
index 40ef5ca88717d4f4d3f9bfa0e5606f3003d06803..af5643324ee3ee854da86e0110e969e3b9118c74 100644 (file)
--- a/drivers/net/ixgb/ixgb_hw.h
+++ b/drivers/net/ixgb/ixgb_hw.h
@@ -711,7 +711,7 @@ struct ixgb_hw {
        uint32_t bar2;
        uint32_t bar3;
        uint16_t pci_cmd_word;  /* PCI command register id from PCI configuration space */
-       uint16_t eeprom[IXGB_EEPROM_SIZE];      /* EEPROM contents read at init time  */
+       __le16 eeprom[IXGB_EEPROM_SIZE];        /* EEPROM contents read at init time  */
        unsigned long io_base;  /* Our I/O mapped location */
        uint32_t lastLFC;
        uint32_t lastRFC;
@@ -809,7 +809,7 @@ void ixgb_get_ee_mac_addr(struct ixgb_hw *hw, uint8_t *mac_addr);
 uint32_t ixgb_get_ee_pba_number(struct ixgb_hw *hw);
 uint16_t ixgb_get_ee_device_id(struct ixgb_hw *hw);
 boolean_t ixgb_get_eeprom_data(struct ixgb_hw *hw);
-uint16_t ixgb_get_eeprom_word(struct ixgb_hw *hw, uint16_t index);
+__le16 ixgb_get_eeprom_word(struct ixgb_hw *hw, uint16_t index);
 
 /* Everything else */
 void ixgb_led_on(struct ixgb_hw *hw);