[PATCH 1/1] Revert "UBUNTU: SAUCE: Default to i915.modeset=0 if CONFIG_DRM_I915_KMS=y"

[Andy Whitcroft]

This reverts commit 1b81042fbb36ddd55d93a3fb8b3f51c31958820e.

The x-server/mesa etc as released into Karmic should now be KMS capable
for Intel platforms.  Enable KMS by default on Intel platforms.

Signed-off-by: Andy Whitcroft <apw at canonical.com>
---
 drivers/gpu/drm/i915/i915_drv.c |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 3a33213..98560e1 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -36,12 +36,7 @@
 #include "drm_pciids.h"
 #include <linux/console.h>
 
-#if defined(CONFIG_DRM_I915_KMS)
-static unsigned int i915_modeset = 0;
-#else
 static unsigned int i915_modeset = -1;
-#endif
-
 module_param_named(modeset, i915_modeset, int, 0400);
 
 unsigned int i915_fbpercrtc = 0;
-- 
1.6.3.rc3.199.g24398