bitkeeper revision 1.1159.212.131 (4208dea93kRwptTEZzh2Dm2aH9dAKA)

merge

2 files changed, 1 insertions, 66 deletions

diff --git a/xen/drivers/pci/Makefile b/xen/drivers/pci/Makefile
index 040d5aaccd..f2580105df 100644
--- a/xen/drivers/pci/Makefile
+++ b/xen/drivers/pci/Makefile
@@ -4,7 +4,7 @@
 
 include $(BASEDIR)/Rules.mk
 
-OBJS := pci.o quirks.o compat.o names.o setup-res.o
+OBJS := pci.o quirks.o names.o setup-res.o
 
 #obj-$(CONFIG_PCI) += pci.o quirks.o compat.o names.o
 #obj-$(CONFIG_PROC_FS) += proc.o
diff --git a/xen/drivers/pci/compat.c b/xen/drivers/pci/compat.c
index 61e14b0a84..e69de29bb2 100644
--- a/xen/drivers/pci/compat.c
+++ b/xen/drivers/pci/compat.c
@@ -1,65 +0,0 @@
-/*
- *	$Id: compat.c,v 1.1 1998/02/16 10:35:50 mj Exp $
- *
- *	PCI Bus Services -- Function For Backward Compatibility
- *
- *	Copyright 1998--2000 Martin Mares <mj@ucw.cz>
- */
-
-#include <xen/types.h>
-//#include <xen/kernel.h>
-#include <xen/pci.h>
-
-int
-pcibios_present(void)
-{
-	return !list_empty(&pci_devices);
-}
-
-int
-pcibios_find_class(unsigned int class, unsigned short index, unsigned char *bus, unsigned char *devfn)
-{
-	const struct pci_dev *dev = NULL;
-	int cnt = 0;
-
-	while ((dev = pci_find_class(class, dev)))
-		if (index == cnt++) {
-			*bus = dev->bus->number;
-			*devfn = dev->devfn;
-			return PCIBIOS_SUCCESSFUL;
-		}
-	return PCIBIOS_DEVICE_NOT_FOUND;
-}
-
-
-int
-pcibios_find_device(unsigned short vendor, unsigned short device, unsigned short index,
-		    unsigned char *bus, unsigned char *devfn)
-{
-	const struct pci_dev *dev = NULL;
-	int cnt = 0;
-
-	while ((dev = pci_find_device(vendor, device, dev)))
-		if (index == cnt++) {
-			*bus = dev->bus->number;
-			*devfn = dev->devfn;
-			return PCIBIOS_SUCCESSFUL;
-		}
-	return PCIBIOS_DEVICE_NOT_FOUND;
-}
-
-#define PCI_OP(rw,size,type)							\
-int pcibios_##rw##_config_##size (unsigned char bus, unsigned char dev_fn,	\
-				  unsigned char where, unsigned type val)	\
-{										\
-	struct pci_dev *dev = pci_find_slot(bus, dev_fn);			\
-	if (!dev) return PCIBIOS_DEVICE_NOT_FOUND;				\
-	return pci_##rw##_config_##size(dev, where, val);			\
-}
-
-PCI_OP(read, byte, char *)
-PCI_OP(read, word, short *)
-PCI_OP(read, dword, int *)
-PCI_OP(write, byte, char)
-PCI_OP(write, word, short)
-PCI_OP(write, dword, int)