From 6b7a0cb03fbe7c6fddacc5c322b77997b8092e23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krzysztof=20Ha=C5=82asa?= Date: Mon, 2 Aug 2010 16:03:29 -0700 Subject: [PATCH] --- yaml --- r: 204010 b: refs/heads/master c: 9292d8f20ff3c034c99c2adfe27496957b3defe3 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/tulip/tulip_core.c | 6 ++++++ trunk/include/linux/pci_ids.h | 3 +++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index c80712bab72a..7c1e39c6a315 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3f326d40994f922e0a3e468dd7fd9999eaf71574 +refs/heads/master: 9292d8f20ff3c034c99c2adfe27496957b3defe3 diff --git a/trunk/drivers/net/tulip/tulip_core.c b/trunk/drivers/net/tulip/tulip_core.c index 14e5312e906e..3a8d7efa2acf 100644 --- a/trunk/drivers/net/tulip/tulip_core.c +++ b/trunk/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/trunk/include/linux/pci_ids.h b/trunk/include/linux/pci_ids.h index 9ac60dabb6ff..384c2a25db1f 100644 --- a/trunk/include/linux/pci_ids.h +++ b/trunk/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