diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-04-30 15:48:19 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-05-11 11:35:58 -0700 |
| commit | 47c92858446004d3cf28d8115266d631cdfd5d0a (patch) | |
| tree | 7a74b83262e109add573daf2ff6fb272d26b3534 /drivers/staging | |
| parent | 8e81f184d9fc3c607a2f0b236d765eb348fbd845 (diff) | |
| download | kernel_samsung_smdk4412-47c92858446004d3cf28d8115266d631cdfd5d0a.zip kernel_samsung_smdk4412-47c92858446004d3cf28d8115266d631cdfd5d0a.tar.gz kernel_samsung_smdk4412-47c92858446004d3cf28d8115266d631cdfd5d0a.tar.bz2 | |
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>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/comedi/drivers/adl_pci9118.c | 3 | ||||
| -rw-r--r-- | drivers/staging/comedi/pci_ids.h | 31 |
2 files changed, 2 insertions, 32 deletions
diff --git a/drivers/staging/comedi/drivers/adl_pci9118.c b/drivers/staging/comedi/drivers/adl_pci9118.c index c7cba95..dc4bd04 100644 --- a/drivers/staging/comedi/drivers/adl_pci9118.c +++ b/drivers/staging/comedi/drivers/adl_pci9118.c @@ -63,7 +63,6 @@ Configuration options: */ #include "../comedidev.h" -#include "../pci_ids.h" #include <linux/delay.h> #include <linux/gfp.h> @@ -74,6 +73,8 @@ Configuration options: #include "comedi_pci.h" #include "comedi_fc.h" +#define PCI_VENDOR_ID_AMCC 0x10e8 + /* paranoid checks are broken */ #undef PCI9118_PARANOIDCHECK /* * if defined, then is used code which control diff --git a/drivers/staging/comedi/pci_ids.h b/drivers/staging/comedi/pci_ids.h deleted file mode 100644 index d979aa8..0000000 --- a/drivers/staging/comedi/pci_ids.h +++ /dev/null @@ -1,31 +0,0 @@ -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ - -#ifndef __COMPAT_LINUX_PCI_IDS_H -#define __COMPAT_LINUX_PCI_IDS_H - -#include <linux/pci_ids.h> - -#ifndef PCI_VENDOR_ID_AMCC -#define PCI_VENDOR_ID_AMCC 0x10e8 -#endif - -#ifndef PCI_VENDOR_ID_CBOARDS -#define PCI_VENDOR_ID_CBOARDS 0x1307 -#endif - -#ifndef PCI_VENDOR_ID_QUANCOM -#define PCI_VENDOR_ID_QUANCOM 0x8008 -#endif - -#ifndef PCI_DEVICE_ID_QUANCOM_GPIB -#define PCI_DEVICE_ID_QUANCOM_GPIB 0x3302 -#endif - -#endif /* __COMPAT_LINUX_PCI_IDS_H */ |