xserver: Branch 'master'

[Adam Jackson]

 hw/xfree86/os-support/bus/Pci.h |    8 --------
 1 file changed, 8 deletions(-)

New commits:
commit 9a39b6cfbda306eb594e87ce828afa01cd7aa01e
Author: Adam Jackson <ajax at redhat.com>
Date:   Mon Aug 18 14:26:01 2008 -0400

    Remove XF86SCANPCI_WRAPPER.

diff --git a/hw/xfree86/os-support/bus/Pci.h b/hw/xfree86/os-support/bus/Pci.h
index c01bdc5..26ba947 100644
--- a/hw/xfree86/os-support/bus/Pci.h
+++ b/hw/xfree86/os-support/bus/Pci.h
@@ -215,14 +215,6 @@
 
 extern void ARCH_PCI_INIT(void);
 
-#if defined(XF86SCANPCI_WRAPPER)
-typedef enum {
-    SCANPCI_INIT,
-    SCANPCI_TERM
-} scanpciWrapperOpt;
-extern void XF86SCANPCI_WRAPPER(scanpciWrapperOpt flags);
-#endif
-
 /*
  * Table of functions used to access a specific PCI bus domain
  * (e.g. a primary PCI bus and all of its secondaries)