summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlan Hourihane <alanh@fairlite.demon.co.uk>2006-08-16 17:16:28 +0100
committerAlan Hourihane <alanh@fairlite.demon.co.uk>2006-08-16 17:16:28 +0100
commitcdcc6f23e8cad797e6cfd57e2ff454ec8509b5ba (patch)
treed9b19af665fdef01320d6eaf0aa84c0d79281d9f /src
parenta94c96abf90c691faecbebf0c8d08f8010bc67ef (diff)
Disable device check when mergedfb in operation.
Diffstat (limited to 'src')
-rw-r--r--src/i830_driver.c2
1 files changed, 1 insertions, 1 deletions
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)) {