xserver: Branch 'master'

[Chris Ball]

 hw/xfree86/os-support/bus/xf86Pci.h |    1 -
 1 file changed, 1 deletion(-)

New commits:
commit a932744d983845f81791045cf0dfb6a359790158
Author: Chris Ball <cjb at laptop.org>
Date:   Mon Feb 16 18:27:26 2009 -0500

    Build fix, remove export of pciBusAddrToHostAddr
    
    a9d7d659.. (PCI: Remove pciBusAddrToHostAddr and associated nonsense)
    removes pciBusAddrToHostAddr(), but not its prototype, resulting in:
    
    ./.libs/libxorg.a(sdksyms.o):(.data.rel+0xe64): undefined reference to
    `pciBusAddrToHostAddr'
    
    Signed-off-by: Chris Ball <cjb at laptop.org>

diff --git a/hw/xfree86/os-support/bus/xf86Pci.h b/hw/xfree86/os-support/bus/xf86Pci.h
index 415f071..ce1336b 100644
--- a/hw/xfree86/os-support/bus/xf86Pci.h
+++ b/hw/xfree86/os-support/bus/xf86Pci.h
@@ -251,7 +251,6 @@ typedef enum {
 
 
 /* Public PCI access functions */
-extern _X_EXPORT ADDRESS pciBusAddrToHostAddr(PCITAG tag, PciAddrType type, ADDRESS addr);
 extern _X_EXPORT PCITAG pciTag(int busnum, int devnum, int funcnum);
 extern _X_EXPORT Bool xf86scanpci(void);