From: Frank Mori Hess <fmhess@speakeasy.net>
Date: Mon, 25 Feb 2002 21:48:34 +0000 (+0000)
Subject: undid addition of PCI_VENDOR_ID_ICP, since it was already added to comedidev.h
X-Git-Tag: r0_7_64~99
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6ffe7eb0990abc567a9128bfd1a96647d25e3de4;p=comedi.git

undid addition of PCI_VENDOR_ID_ICP, since it was already added to comedidev.h
Not sure why I had this problem in the first place, must have had a problem with
cvs update
---

diff --git a/include/linux/pci.h b/include/linux/pci.h
index 19a04bae..fafb5fb6 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -23,9 +23,6 @@
 #define pci_enable_device(x) 0
 
 #define PCI_ANY_ID (~0)
-#ifndef PCI_VENDOR_ID_ICP
-#define PCI_VENDOR_ID_ICP 0x104c
-#endif
 
 struct pci_device_id {
 	unsigned int vendor, device;