From cdcc6f23e8cad797e6cfd57e2ff454ec8509b5ba Mon Sep 17 00:00:00 2001
From: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Wed, 16 Aug 2006 17:16:28 +0100
Subject: [PATCH] Disable device check when mergedfb in operation.

---
 src/i830_driver.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i830_driver.c b/src/i830_driver.c
index 21adbaf0..c0d96725 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -4398,7 +4398,7 @@ I830BIOSPreInit(ScrnInfoPtr pScrn, int flags)
    /*
     * Let's setup the mobile systems to check the lid status
     */
-   if (IS_MOBILE(pI830)) {
+   if (IS_MOBILE(pI830) && !pI830->MergedFB) {
       pI830->checkDevices = TRUE;
 
       if (!xf86ReturnOptValBool(pI830->Options, OPTION_CHECKDEVICES, TRUE)) {