From ea08ae0929b81664f2f69811a066c47bf91d12a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= <kde@martin-graesslin.com>
Date: Sat, 1 Jan 2011 14:34:55 +0100
Subject: [PATCH] Fix rebasing failure

---
 compositingprefs.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/compositingprefs.cpp b/compositingprefs.cpp
index d9b33bdfaf..04197b8bd6 100644
--- a/compositingprefs.cpp
+++ b/compositingprefs.cpp
@@ -367,6 +367,7 @@ void CompositingPrefs::applyDriverSpecificOptions()
     mStrictBinding = !gl->supports( LooseBinding );
     if ( gl->driver() == Driver_Intel )
         mEnableVSync = false;
+#endif
     }