Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...

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

diff --git a/drivers/net/ixgb/ixgb_ee.h b/drivers/net/ixgb/ixgb_ee.h
index 7908bf3005ed53e121f56e696f01ec3a6917e7b8..7ea12652f47199d0ae9b7f02535b4c18166b1ecb 100644 (file)
--- a/drivers/net/ixgb/ixgb_ee.h
+++ b/drivers/net/ixgb/ixgb_ee.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel PRO/10GbE Linux driver
-  Copyright(c) 1999 - 2006 Intel Corporation.
+  Copyright(c) 1999 - 2008 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
@@ -34,11 +34,11 @@
 #define IXGB_ETH_LENGTH_OF_ADDRESS   6
 
 /* EEPROM Commands */
-#define EEPROM_READ_OPCODE  0x6        /* EERPOM read opcode */
-#define EEPROM_WRITE_OPCODE 0x5        /* EERPOM write opcode */
-#define EEPROM_ERASE_OPCODE 0x7        /* EERPOM erase opcode */
-#define EEPROM_EWEN_OPCODE  0x13       /* EERPOM erase/write enable */
-#define EEPROM_EWDS_OPCODE  0x10       /* EERPOM erast/write disable */
+#define EEPROM_READ_OPCODE  0x6        /* EEPROM read opcode */
+#define EEPROM_WRITE_OPCODE 0x5        /* EEPROM write opcode */
+#define EEPROM_ERASE_OPCODE 0x7        /* EEPROM erase opcode */
+#define EEPROM_EWEN_OPCODE  0x13       /* EEPROM erase/write enable */
+#define EEPROM_EWDS_OPCODE  0x10       /* EEPROM erase/write disable */
 
 /* EEPROM MAP (Word Offsets) */
 #define EEPROM_IA_1_2_REG        0x0000
@@ -75,7 +75,7 @@
 
 /* EEPROM structure */
 struct ixgb_ee_map_type {
-       uint8_t mac_addr[IXGB_ETH_LENGTH_OF_ADDRESS];
+       u8 mac_addr[IXGB_ETH_LENGTH_OF_ADDRESS];
        __le16 compatibility;
        __le16 reserved1[4];
        __le32 pba_number;
@@ -88,19 +88,19 @@ struct ixgb_ee_map_type {
        __le16 oem_reserved[16];
        __le16 swdpins_reg;
        __le16 circuit_ctrl_reg;
-       uint8_t d3_power;
-       uint8_t d0_power;
+       u8 d3_power;
+       u8 d0_power;
        __le16 reserved2[28];
        __le16 checksum;
 };
 
 /* EEPROM Functions */
-uint16_t ixgb_read_eeprom(struct ixgb_hw *hw, uint16_t reg);
+u16 ixgb_read_eeprom(struct ixgb_hw *hw, u16 reg);
 
-boolean_t ixgb_validate_eeprom_checksum(struct ixgb_hw *hw);
+bool ixgb_validate_eeprom_checksum(struct ixgb_hw *hw);
 
 void ixgb_update_eeprom_checksum(struct ixgb_hw *hw);
 
-void ixgb_write_eeprom(struct ixgb_hw *hw, uint16_t reg, uint16_t data);
+void ixgb_write_eeprom(struct ixgb_hw *hw, u16 reg, u16 data);
 
 #endif                         /* IXGB_EE_H */