projects / GitHub / LineageOS / android_kernel_samsung_universal7580.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 7a102e0)
Staging: comedi: move a pci vendor id
authorGreg Kroah-Hartman <gregkh@suse.de>
Sat, 1 May 2010 00:07:25 +0000 (17:07 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 11 May 2010 18:35:58 +0000 (11:35 -0700)
The vendor id should be in the driver that needs it, not in
a common file.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/comedi/comedidev.h patch | blob | blame | history
drivers/staging/comedi/drivers/me_daq.c patch | blob | blame | history

diff --git a/drivers/staging/comedi/comedidev.h b/drivers/staging/comedi/comedidev.h
index 162ac8d913e51c909946b8f5dfc9117e11403644..09d3c51097f7f2e5dfd2e75fa480a690f34f3cf7 100644 (file)
--- a/drivers/staging/comedi/comedidev.h
+++ b/drivers/staging/comedi/comedidev.h
@@ -115,7 +115,6 @@
 #define PCI_VENDOR_ID_ADLINK           0x144a
 #define PCI_VENDOR_ID_ICP              0x104c
 #define PCI_VENDOR_ID_CONTEC           0x1221
-#define PCI_VENDOR_ID_MEILHAUS         0x1402
 
 #define COMEDI_NUM_MINORS 0x100
 #define COMEDI_NUM_BOARD_MINORS 0x30
diff --git a/drivers/staging/comedi/drivers/me_daq.c b/drivers/staging/comedi/drivers/me_daq.c
index 80e192d2e77e8a5f8f82fa6fb3fd108d7e4e3946..c8484aec657db8b2491bcb1b23bfa78be524c034 100644 (file)
--- a/drivers/staging/comedi/drivers/me_daq.c
+++ b/drivers/staging/comedi/drivers/me_daq.c
@@ -60,6 +60,7 @@ from http://www.comedi.org
 
 #define ME_DRIVER_NAME         "me_daq"
 
+#define PCI_VENDOR_ID_MEILHAUS 0x1402
 #define ME2000_DEVICE_ID       0x2000
 #define ME2600_DEVICE_ID       0x2600