Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

[mv-sheeva.git] / drivers / staging / comedi / drivers / cb_pcimdda.c

diff --git a/drivers/staging/comedi/drivers/cb_pcimdda.c b/drivers/staging/comedi/drivers/cb_pcimdda.c
index e32a31763d50ae9beaaf4afb88d64c2dea769533..f404ec7723e52cb1c3a8481e730c58ad0b8af6db 100644 (file)
--- a/drivers/staging/comedi/drivers/cb_pcimdda.c
+++ b/drivers/staging/comedi/drivers/cb_pcimdda.c
@@ -91,7 +91,8 @@ Configuration Options:
 #include "8255.h"
 
 /* device ids of the cards we support -- currently only 1 card supported */
-#define PCI_ID_PCIM_DDA06_16 0x0053
+#define PCI_VENDOR_ID_COMPUTERBOARDS   0x1307
+#define PCI_ID_PCIM_DDA06_16           0x0053
 
 /*
  * This is straight from skel.c -- I did this in case this source file