From ca203aa84183376930118f79c09a737d1752a35f Mon Sep 17 00:00:00 2001
From: Ian Abbott <abbotti@mev.co.uk>
Date: Mon, 29 Oct 2012 14:40:18 +0000
Subject: [PATCH] --- yaml --- r: 343237 b: refs/heads/master c:
 2794bb28b66b61eca15ffc492463001445a47227 h: refs/heads/master i:   343235:
 50a05e01a6043c1e93da863da471462f24e2ef0f v: v3

---
 [refs]                     |  2 +-
 trunk/drivers/pci/quirks.c | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 1594ee9032d0..1c6f05a32c5e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 21c5fd97380ba22c2a616b482307b2ef94429f31
+refs/heads/master: 2794bb28b66b61eca15ffc492463001445a47227
diff --git a/trunk/drivers/pci/quirks.c b/trunk/drivers/pci/quirks.c
index 2d0d1c229c68..0c59f7aba12b 100644
--- a/trunk/drivers/pci/quirks.c
+++ b/trunk/drivers/pci/quirks.c
@@ -1817,6 +1817,17 @@ static void __devinit quirk_plx_pci9050(struct pci_dev *dev)
 }
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9050,
 			 quirk_plx_pci9050);
+/*
+ * The following Meilhaus (vendor ID 0x1402) device IDs (amongst others)
+ * may be using the PLX PCI 9050: 0x0630, 0x0940, 0x0950, 0x0960, 0x100b,
+ * 0x1400, 0x140a, 0x140b, 0x14e0, 0x14ea, 0x14eb, 0x1604, 0x1608, 0x160c,
+ * 0x168f, 0x2000, 0x2600, 0x3000, 0x810a, 0x810b.
+ *
+ * Currently, device IDs 0x2000 and 0x2600 are used by the Comedi "me_daq"
+ * driver.
+ */
+DECLARE_PCI_FIXUP_HEADER(0x1402, 0x2000, quirk_plx_pci9050);
+DECLARE_PCI_FIXUP_HEADER(0x1402, 0x2600, quirk_plx_pci9050);
 
 static void __devinit quirk_netmos(struct pci_dev *dev)
 {