[xserver-commit] xserver/hw/xizzle/os-support/bus Pci.h,1.46,1.47

[Daniel Stone]

Committed by: daniel

Update of /cvs/xserver/xserver/hw/xizzle/os-support/bus
In directory pdx:/tmp/cvs-serv13000/os-support/bus

Modified Files:
	Pci.h 
Log Message:
'No, really, it should build now.'

os-support/linux/drm/Makefile.am: Add missing file.
common/xf86Config.c: Add GetDriverlistFromCompile(), modify semantics. THIS
NEEDS FIXING.
os-support/bus/Pci.h: Disable x86-specific PCI functions for now.


Index: Pci.h
===================================================================
RCS file: /cvs/xserver/xserver/hw/xizzle/os-support/bus/Pci.h,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- a/Pci.h	19 Feb 2004 03:51:37 -0000	1.46
+++ b/Pci.h	9 Mar 2004 11:54:34 -0000	1.47
@@ -262,11 +262,12 @@
 # endif
 # define XF86SCANPCI_WRAPPER ia64ScanPCIWrapper
 #elif defined(__i386__) || defined(i386)
-# define ARCH_PCI_INIT ix86PciInit
+/* # define ARCH_PCI_INIT ix86PciInit */
 # define INCLUDE_XF86_MAP_PCI_MEM
 # define INCLUDE_XF86_NO_DOMAIN
 # if defined(linux)
 #  define ARCH_PCI_OS_INIT linuxPciInit
+#  define ARCH_PCI_INIT linuxPciInit
 # endif
 #elif defined(__mc68000__)
 # if defined(linux)