diff options
| author | Greg Kroah-Hartman | 2008-11-19 02:20:22 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2009-01-06 22:52:23 +0100 |
| commit | 6fd15040a6550c32e8db04cbb00b8b7703801b65 (patch) | |
| tree | 4531e9ecadc802f0e5c2098931210cb48bdfe0fb /drivers/staging | |
| parent | Staging: comedi: remove usb wrappers (diff) | |
| download | kernel-qcow2-linux-6fd15040a6550c32e8db04cbb00b8b7703801b65.tar.gz kernel-qcow2-linux-6fd15040a6550c32e8db04cbb00b8b7703801b65.tar.xz kernel-qcow2-linux-6fd15040a6550c32e8db04cbb00b8b7703801b65.zip | |
Staging: comedi: remove PCI wrappers
The PCI wrapper macros are no longer needed, as they are
all for compatiblity with older kernel versions.
Cc: Anders Blomdell <anders.blomdell@control.lth.se>
Cc: David Schleef <ds@schleef.org>
Cc: Frank Mori Hess <fmhess@users.sourceforge.net>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/comedi/drivers/mite.h | 2 | ||||
| -rw-r--r-- | drivers/staging/comedi/pci.h | 31 |
2 files changed, 1 insertions, 32 deletions
diff --git a/drivers/staging/comedi/drivers/mite.h b/drivers/staging/comedi/drivers/mite.h index 90a656b5c5b7..b84eafa6ff2b 100644 --- a/drivers/staging/comedi/drivers/mite.h +++ b/drivers/staging/comedi/drivers/mite.h @@ -24,8 +24,8 @@ #ifndef _MITE_H_ #define _MITE_H_ +#include <linux/pci.h> #include "../comedidev.h" -#include "../pci.h" #define PCI_VENDOR_ID_NATINST 0x1093 diff --git a/drivers/staging/comedi/pci.h b/drivers/staging/comedi/pci.h deleted file mode 100644 index 962e4348ac22..000000000000 --- a/drivers/staging/comedi/pci.h +++ /dev/null @@ -1,31 +0,0 @@ -/* - * linux/pci.h compatibility header - */ - -#ifndef _COMPAT_PCI_H -#define _COMPAT_PCI_H - -#include <linux/version.h> - -#include <linux/pci.h> - -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0) -#define pci_get_device pci_find_device -#define pci_get_subsys pci_find_subsys -#define pci_dev_get(x) (x) -#define pci_dev_put(x) -#endif - -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,22) -static inline char *pci_name(struct pci_dev *pdev) -{ - return pdev->slot_name; -} -#endif - -#ifndef DEFINE_PCI_DEVICE_TABLE -#define DEFINE_PCI_DEVICE_TABLE(_table) \ - struct pci_device_id _table[] -#endif - -#endif /* _COMPAT_PCI_H */ |