From b89bda3fdbb2f2a06cc8cf9598aab8a1d1415863 Mon Sep 17 00:00:00 2001
From: Peter Huewe <peterhuewe@gmx.de>
Date: Mon, 7 Nov 2011 00:54:03 +0100
Subject: [PATCH] --- yaml --- r: 281087 b: refs/heads/master c:
 71d4c80db1e042baae6c5a2ca1bbfc16c89bd2b5 h: refs/heads/master i:   281085:
 eb170c5600972e5006f8db36ec5a5cc27569e250   281083:
 49b60501d4d1ca8723ff96185ebbdf45f7009b08   281079:
 6b99f32aaf89c5b25b2c52468acdc8697b80026f   281071:
 cf1f51186d08821fc087e683ce4e323ee8a943e1   281055:
 7b8592d03da9beb53d71756d9eb687181eefabd1   281023:
 33fb845bd4e77d20329a8384e01b9eca7d95702e   280959:
 b415ecba1084ab751dcfcd9beaf894db52a7ba27   280831:
 0c975dc2eadccd8e3096bbdbc14bc3ea958c382b   280575:
 cd71a68d22357df1cd89122de4b852a9f825e274 v: v3

---
 [refs]                                            | 2 +-
 trunk/drivers/staging/comedi/drivers/cb_pcimdda.c | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index d0488970b0ea..334266a3eedf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8edbfb8dec32fa5a5bad0c2a5b49845f7b911f55
+refs/heads/master: 71d4c80db1e042baae6c5a2ca1bbfc16c89bd2b5
diff --git a/trunk/drivers/staging/comedi/drivers/cb_pcimdda.c b/trunk/drivers/staging/comedi/drivers/cb_pcimdda.c
index 8c981a89ab63..6521d6196ea9 100644
--- a/trunk/drivers/staging/comedi/drivers/cb_pcimdda.c
+++ b/trunk/drivers/staging/comedi/drivers/cb_pcimdda.c
@@ -144,10 +144,8 @@ static const struct board_struct boards[] = {
 /* Please add your PCI vendor ID to comedidev.h, and it will be forwarded
  * upstream. */
 static DEFINE_PCI_DEVICE_TABLE(pci_table) = {
-	{
-	PCI_VENDOR_ID_COMPUTERBOARDS, PCI_ID_PCIM_DDA06_16, PCI_ANY_ID,
-		    PCI_ANY_ID, 0, 0, 0}, {
-	0}
+	{ PCI_DEVICE(PCI_VENDOR_ID_COMPUTERBOARDS, PCI_ID_PCIM_DDA06_16) },
+	{0}
 };
 
 MODULE_DEVICE_TABLE(pci, pci_table);