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.
This commit is contained in:
parent
7dfb3cea91
commit
844560a02f
|
@ -238,11 +238,6 @@ pciInit(void)
|
|||
#endif
|
||||
|
||||
ARCH_PCI_INIT();
|
||||
#if defined(ARCH_PCI_OS_INIT)
|
||||
if (pciNumBuses <= 0) {
|
||||
ARCH_PCI_OS_INIT();
|
||||
}
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -281,12 +281,7 @@ void ix86PciSelectCfgmech(void)
|
|||
* We rely on xf86Info.pciFlags to tell which mechanisms to try....
|
||||
*/
|
||||
switch (xf86Info.pciFlags) {
|
||||
|
||||
case PCIOsConfig:
|
||||
#ifdef ARCH_PCI_OS_INIT
|
||||
return;
|
||||
#endif
|
||||
|
||||
case PCIProbe1:
|
||||
if (!xf86EnableIO())
|
||||
return;
|
||||
|
|
Loading…
Reference in New Issue
Block a user