xf86-video-ati: Branch 'master'

[Adam Jackson]

 src/radeon_probe.c |   17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

New commits:
commit cdf522f5992adf7b76f9153c777e6dddcf7758a6
Author: Adam Jackson <ajax at redhat.com>
Date:   Wed Aug 15 13:38:28 2012 -0400

    Implement ->driverFunc
    
    Copied from fbdev, makes it so we can run without iopl.
    
    Signed-off-by: Adam Jackson <ajax at redhat.com>

diff --git a/src/radeon_probe.c b/src/radeon_probe.c
index 8044b45..6ddfa88 100644
--- a/src/radeon_probe.c
+++ b/src/radeon_probe.c
@@ -240,6 +240,21 @@ radeon_pci_probe(
 
 #endif /* XSERVER_LIBPCIACCESS */
 
+static Bool
+RADEONDriverFunc(ScrnInfoPtr scrn, xorgDriverFuncOp op, void *data)
+{
+    xorgHWFlags *flag;
+
+    switch (op) {
+	case GET_REQUIRED_HW_INTERFACES:
+	    flag = (CARD32 *)data;
+	    (*flag) = 0;
+	    return TRUE;
+	default:
+	    return FALSE;
+    }
+}
+
 _X_EXPORT DriverRec RADEON =
 {
     RADEON_VERSION_CURRENT,
@@ -253,7 +268,7 @@ _X_EXPORT DriverRec RADEON =
     RADEONAvailableOptions,
     NULL,
     0,
-    NULL,
+    RADEONDriverFunc,
 #ifdef XSERVER_LIBPCIACCESS
     radeon_device_match,
     radeon_pci_probe