xserver: Branch 'master'

[Adam Jackson]

 hw/xfree86/common/xf86AutoConfig.c |    1 -
 1 file changed, 1 deletion(-)

New commits:
commit e812103382a7bc3f7ba8b2f44ab97960dec265a9
Author: Adam Jackson <ajax at redhat.com>
Date:   Thu Jul 9 10:58:17 2009 -0400

    config: drop i810.
    
    The driver assuredly no longer builds against 1.7.  Please don't feel
    compelled to fix it.

diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c
index ada1ca5..bc4c80b 100644
--- a/hw/xfree86/common/xf86AutoConfig.c
+++ b/hw/xfree86/common/xf86AutoConfig.c
@@ -176,7 +176,6 @@ videoPtrToDriverList(struct pci_device *dev,
                 break; /* "hooray" for poulsbo */
 	    } else {
 		driverList[0] = "intel";
-		driverList[1] = "i810";
 	    }
 	    break;
 	case 0x102b:		    driverList[0] = "mga";	break;