diff options
| author | Ian Romanick <idr@us.ibm.com> | 2007-01-22 09:13:59 -0800 |
|---|---|---|
| committer | Ian Romanick <idr@us.ibm.com> | 2007-01-22 09:13:59 -0800 |
| commit | 844560a02fa6c4ce18ea2af3ec27beaa60b7af11 (patch) | |
| tree | dfc310e34b2eee5ce42c102287a83789800a22d2 /hw/xfree86/os-support/bus/Pci.h | |
| parent | 7dfb3cea913b02a6b36c308d1330bd40abe6b41f (diff) | |
Elminiate ARCH_PCI_OS_INIT.
Never, ever use the ix86Pci stuff on Linux. This renders the whole
ARCH_PCI_OS_INIT mechanism useless. Remove it.
Diffstat (limited to 'hw/xfree86/os-support/bus/Pci.h')
| -rw-r--r-- | hw/xfree86/os-support/bus/Pci.h | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/hw/xfree86/os-support/bus/Pci.h b/hw/xfree86/os-support/bus/Pci.h index bc322acf7..59ad6a1e8 100644 --- a/hw/xfree86/os-support/bus/Pci.h +++ b/hw/xfree86/os-support/bus/Pci.h @@ -216,11 +216,12 @@ # endif # define XF86SCANPCI_WRAPPER ia64ScanPCIWrapper #elif defined(__i386__) || defined(i386) -# define ARCH_PCI_INIT ix86PciInit -# define INCLUDE_XF86_NO_DOMAIN # if defined(linux) -# define ARCH_PCI_OS_INIT linuxPciInit +# define ARCH_PCI_INIT linuxPciInit +# else +# define ARCH_PCI_INIT ix86PciInit # endif +# define INCLUDE_XF86_NO_DOMAIN #elif defined(__mc68000__) # if defined(linux) # define ARCH_PCI_INIT linuxPciInit @@ -270,13 +271,12 @@ #elif defined(__amd64__) || defined(__amd64) # if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) # define ARCH_PCI_INIT freebsdPciInit +# elif defined(linux) +# define ARCH_PCI_INIT linuxPciInit # else # define ARCH_PCI_INIT ix86PciInit # endif # define INCLUDE_XF86_NO_DOMAIN -# if defined(linux) -# define ARCH_PCI_OS_INIT linuxPciInit -# endif #endif #ifndef ARCH_PCI_INIT @@ -286,9 +286,6 @@ #undef INCLUDE_XF86_NO_DOMAIN extern void ARCH_PCI_INIT(void); -#if defined(ARCH_PCI_OS_INIT) -extern void ARCH_PCI_OS_INIT(void); -#endif #if defined(XF86SCANPCI_WRAPPER) typedef enum { |