Merge tag 'nfs-for-3.6-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

[~andy/linux] / drivers / net / ethernet / intel / ixgb / ixgb_hw.c

diff --git a/drivers/net/ethernet/intel/ixgb/ixgb_hw.c b/drivers/net/ethernet/intel/ixgb/ixgb_hw.c
index 99b69adb4a0fd77ce0477185e7077c122def73fa..bf9a220f71fba5dfe6c5ed83c45569c87e30d26b 100644 (file)
--- a/drivers/net/ethernet/intel/ixgb/ixgb_hw.c
+++ b/drivers/net/ethernet/intel/ixgb/ixgb_hw.c
@@ -32,6 +32,7 @@
 
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
+#include <linux/pci_ids.h>
 #include "ixgb_hw.h"
 #include "ixgb_ids.h"
 
@@ -96,7 +97,7 @@ static u32 ixgb_mac_reset(struct ixgb_hw *hw)
        ASSERT(!(ctrl_reg & IXGB_CTRL0_RST));
 #endif
 
-       if (hw->subsystem_vendor_id == SUN_SUBVENDOR_ID) {
+       if (hw->subsystem_vendor_id == PCI_VENDOR_ID_SUN) {
                ctrl_reg =  /* Enable interrupt from XFP and SerDes */
                           IXGB_CTRL1_GPI0_EN |
                           IXGB_CTRL1_SDP6_DIR |
@@ -271,7 +272,7 @@ ixgb_identify_phy(struct ixgb_hw *hw)
        }
 
        /* update phy type for sun specific board */
-       if (hw->subsystem_vendor_id == SUN_SUBVENDOR_ID)
+       if (hw->subsystem_vendor_id == PCI_VENDOR_ID_SUN)
                phy_type = ixgb_phy_type_bcm;
 
        return phy_type;