Merge tag 'pci-v5.1-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

[sfrench/cifs-2.6.git] / drivers / net / ethernet / oki-semi / pch_gbe / pch_gbe_main.c

diff --git a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
index 552d930e39401291389ab93c3e76187f037abaca..528f6b4fd16ac033052b1ad1b02dff92e4ee3392 100644 (file)
--- a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
+++ b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
@@ -27,7 +27,6 @@
 #define DRV_VERSION     "1.01"
 const char pch_driver_version[] = DRV_VERSION;
 
-#define PCI_DEVICE_ID_INTEL_IOH1_GBE   0x8802          /* Pci device ID */
 #define PCH_GBE_MAR_ENTRIES            16
 #define PCH_GBE_SHORT_PKT              64
 #define DSC_INIT16                     0xC000
@@ -37,11 +36,9 @@ const char pch_driver_version[] = DRV_VERSION;
 #define PCH_GBE_PCI_BAR                        1
 #define PCH_GBE_RESERVE_MEMORY         0x200000        /* 2MB */
 
-/* Macros for ML7223 */
-#define PCI_VENDOR_ID_ROHM                     0x10db
-#define PCI_DEVICE_ID_ROHM_ML7223_GBE          0x8013
+#define PCI_DEVICE_ID_INTEL_IOH1_GBE           0x8802
 
-/* Macros for ML7831 */
+#define PCI_DEVICE_ID_ROHM_ML7223_GBE          0x8013
 #define PCI_DEVICE_ID_ROHM_ML7831_GBE          0x8802
 
 #define PCH_GBE_TX_WEIGHT         64