2 files changed, 9 insertions, 0 deletions

diff --git a/drivers/net/tulip/tulip_core.c b/drivers/net/tulip/tulip_core.c
index 14e5312e906e..3a8d7efa2acf 100644
--- a/drivers/net/tulip/tulip_core.c
+++ b/drivers/net/tulip/tulip_core.c
@@ -1341,6 +1341,12 @@ static int __devinit tulip_init_one (struct pci_dev *pdev,
         if (pdev->subsystem_vendor == PCI_VENDOR_ID_LMC) {
                 pr_err(PFX "skipping LMC card\n");
                 return -ENODEV;
+        } else if (pdev->subsystem_vendor == PCI_VENDOR_ID_SBE &&
+                   (pdev->subsystem_device == PCI_SUBDEVICE_ID_SBE_T3E3 ||
+                    pdev->subsystem_device == PCI_SUBDEVICE_ID_SBE_2T3E3_P0 ||
+                    pdev->subsystem_device == PCI_SUBDEVICE_ID_SBE_2T3E3_P1)) {
+                pr_err(PFX "skipping SBE T3E3 port\n");
+                return -ENODEV;
         }
 
         /*
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 9ac60dabb6ff..384c2a25db1f 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -1493,6 +1493,9 @@
 #define PCI_DEVICE_ID_SBE_WANXL100      0x0301
 #define PCI_DEVICE_ID_SBE_WANXL200      0x0302
 #define PCI_DEVICE_ID_SBE_WANXL400      0x0104
+#define PCI_SUBDEVICE_ID_SBE_T3E3       0x0009
+#define PCI_SUBDEVICE_ID_SBE_2T3E3_P0   0x0901
+#define PCI_SUBDEVICE_ID_SBE_2T3E3_P1   0x0902
 
 #define PCI_VENDOR_ID_TOSHIBA           0x1179
 #define PCI_DEVICE_ID_TOSHIBA_PICCOLO_1 0x0101