mesa: Branch 'master'

[Dave Airlie]

 src/mesa/drivers/dri/radeon/radeon_screen.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

New commits:
diff-tree 6461e91ac3ce6160107d5df7468572c6e943f442 (from af807a4696866a4ee08bb2a4e95b9c02011db530)
Author: Dave Airlie <airlied at linux.ie>
Date:   Mon Apr 9 22:03:31 2007 +1000

    the RS400 definitely doesn't work at this point so don't let it init

diff --git a/src/mesa/drivers/dri/radeon/radeon_screen.c b/src/mesa/drivers/dri/radeon/radeon_screen.c
index abb14fa..b0c8fae 100644
--- a/src/mesa/drivers/dri/radeon/radeon_screen.c
+++ b/src/mesa/drivers/dri/radeon/radeon_screen.c
@@ -656,7 +656,8 @@ radeonCreateScreen( __DRIscreenPrivate *
    case PCI_CHIP_RC410_5A61:
    case PCI_CHIP_RC410_5A62:
       screen->chip_family = CHIP_FAMILY_RS400;
-      fprintf(stderr, "Warning, xpress200 detected. Probably won't work.\n");
+      fprintf(stderr, "Warning, xpress200 detected. Won't work.\n");
+      return NULL;
       break;
 
    default: