xserver: Branch 'master'

[Alan Coopersmith]

 hw/xfree86/os-support/bus/ix86Pci.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
diff-tree 1d938a80fd4fa58d1791c146b6b5c2dfe148dce7 (from 3b114f2603fc2adeec7f5f8f20fe4870afb8dff1)
Author: Alan Coopersmith <alan.coopersmith at sun.com>
Date:   Wed Sep 26 19:42:46 2007 -0700

    Remove unused pciAddrHostToBus functions from ix86Pci.c
    
    Matches linuxPci.c changes made in 8279444a54f38c5e2e5d4c2d936a10d74990e0be
    Fixes compiler errors:
     "ix86Pci.c", line 194: too many struct/union initializers
     "ix86Pci.c", line 204: too many struct/union initializers
     "ix86Pci.c", line 214: too many struct/union initializers

diff --git a/hw/xfree86/os-support/bus/ix86Pci.c b/hw/xfree86/os-support/bus/ix86Pci.c
index 3ed4f14..bbc4847 100644
--- a/hw/xfree86/os-support/bus/ix86Pci.c
+++ b/hw/xfree86/os-support/bus/ix86Pci.c
@@ -188,8 +188,8 @@ static pciBusFuncs_t ix86Funcs0 = {
 /* pciReadLong      */	ix86PciReadLongSetup,
 /* pciWriteLong     */	ix86PciWriteLongSetup,
 /* pciSetBitsLong   */	ix86PciSetBitsLongSetup,
-#endif
 /* pciAddrHostToBus */	pciAddrNOOP,
+#endif
 /* pciAddrBusToHost */	pciAddrNOOP
 };
 
@@ -198,8 +198,8 @@ static pciBusFuncs_t ix86Funcs1 = {
 /* pciReadLong      */	ix86PciReadLongCFG1,
 /* pciWriteLong     */	ix86PciWriteLongCFG1,
 /* pciSetBitsLong   */	ix86PciSetBitsLongCFG1,
-#endif
 /* pciAddrHostToBus */	pciAddrNOOP,
+#endif
 /* pciAddrBusToHost */	pciAddrNOOP
 };
 
@@ -208,8 +208,8 @@ static pciBusFuncs_t ix86Funcs2 = {
 /* pciReadLong      */	ix86PciReadLongCFG2,
 /* pciWriteLong     */	ix86PciWriteLongCFG2,
 /* pciSetBitsLong   */	ix86PciSetBitsLongCFG2,
-#endif
 /* pciAddrHostToBus */	pciAddrNOOP,
+#endif
 /* pciAddrBusToHost */	pciAddrNOOP
 };