Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Staging: comedi: remove local pci_ids.h file

It's only being used for one vendor id, so move it into
the driver that uses it and delete the file.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

+2 -32
+2 -1
drivers/staging/comedi/drivers/adl_pci9118.c
··· 63 63 64 64 */ 65 65 #include "../comedidev.h" 66 - #include "../pci_ids.h" 67 66 68 67 #include <linux/delay.h> 69 68 #include <linux/gfp.h> ··· 72 73 #include "8253.h" 73 74 #include "comedi_pci.h" 74 75 #include "comedi_fc.h" 76 + 77 + #define PCI_VENDOR_ID_AMCC 0x10e8 75 78 76 79 /* paranoid checks are broken */ 77 80 #undef PCI9118_PARANOIDCHECK /*
-31
drivers/staging/comedi/pci_ids.h
··· 1 - /*************************************************************************** 2 - * * 3 - * This program is free software; you can redistribute it and/or modify * 4 - * it under the terms of the GNU General Public License as published by * 5 - * the Free Software Foundation; either version 2 of the License, or * 6 - * (at your option) any later version. * 7 - * * 8 - ***************************************************************************/ 9 - 10 - #ifndef __COMPAT_LINUX_PCI_IDS_H 11 - #define __COMPAT_LINUX_PCI_IDS_H 12 - 13 - #include <linux/pci_ids.h> 14 - 15 - #ifndef PCI_VENDOR_ID_AMCC 16 - #define PCI_VENDOR_ID_AMCC 0x10e8 17 - #endif 18 - 19 - #ifndef PCI_VENDOR_ID_CBOARDS 20 - #define PCI_VENDOR_ID_CBOARDS 0x1307 21 - #endif 22 - 23 - #ifndef PCI_VENDOR_ID_QUANCOM 24 - #define PCI_VENDOR_ID_QUANCOM 0x8008 25 - #endif 26 - 27 - #ifndef PCI_DEVICE_ID_QUANCOM_GPIB 28 - #define PCI_DEVICE_ID_QUANCOM_GPIB 0x3302 29 - #endif 30 - 31 - #endif /* __COMPAT_LINUX_PCI_IDS_H */