xserver: Branch 'master'

[Adam Jackson]

 hw/xfree86/common/xf86AutoConfig.c |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 8e7facfe3013abda12a0c39ad8b4d025618077a7
Author: Adam Jackson <ajax at redhat.com>
Date:   Fri Mar 27 15:48:17 2009 -0400

    config: Fall back to vesa for Intel Poulsbo.

diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c
index 29b58e9..ada1ca5 100644
--- a/hw/xfree86/common/xf86AutoConfig.c
+++ b/hw/xfree86/common/xf86AutoConfig.c
@@ -172,6 +172,8 @@ videoPtrToDriverList(struct pci_device *dev,
 	case 0x8086:
 	    if ((dev->device_id == 0x00d1) || (dev->device_id == 0x7800)) {
 		driverList[0] = "i740";
+            } else if (dev->device_id == 0x8108) {
+                break; /* "hooray" for poulsbo */
 	    } else {
 		driverList[0] = "intel";
 		driverList[1] = "i810";