summaryrefslogtreecommitdiffstats
path: root/drivers/staging
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/comedi/drivers/mite.h2
-rw-r--r--drivers/staging/comedi/pci.h31
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 */