xf86-video-ati: Branch 'master'

[Dave Airlie]

 src/r128_probe.c   |    4 ++++
 src/radeon_probe.c |    4 ++++
 2 files changed, 8 insertions(+)

New commits:
commit c773bc6a314327da29e21e4ebac6fa7f3e98a0a7
Author: Dave Airlie <airlied at linux.ie>
Date:   Sat Feb 16 09:05:07 2008 +1000

    r128/radeon: fix build without pciaccess

diff --git a/src/r128_probe.c b/src/r128_probe.c
index 7895166..431efef 100644
--- a/src/r128_probe.c
+++ b/src/r128_probe.c
@@ -47,6 +47,10 @@
 #include "xf86PciInfo.h"
 #include "xf86Resources.h"
 
+#ifndef XSERVER_LIBPCIACCESS
+static Bool R128Probe(DriverPtr drv, int flags);
+#endif
+
 SymTabRec R128Chipsets[] = {
     { PCI_CHIP_RAGE128LE, "ATI Rage 128 Mobility M3 LE (PCI)" },
     { PCI_CHIP_RAGE128LF, "ATI Rage 128 Mobility M3 LF (AGP)" },
diff --git a/src/radeon_probe.c b/src/radeon_probe.c
index 658f909..936d43f 100644
--- a/src/radeon_probe.c
+++ b/src/radeon_probe.c
@@ -56,6 +56,10 @@
 #include "radeon_pci_device_match_gen.h"
 #endif
 
+#ifndef XSERVER_LIBPCIACCESS
+static Bool RADEONProbe(DriverPtr drv, int flags);
+#endif
+
 int gRADEONEntityIndex = -1;
 
 /* Return the options for supported chipset 'n'; NULL otherwise */