From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Wed, 19 Nov 2008 01:20:22 +0000 (-0800)
Subject: Staging: comedi: remove PCI wrappers
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6fd15040a6550c32e8db04cbb00b8b7703801b65;p=linux-beck.git

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>
---

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 */