From d81fa8e628c1b311a50ae616f256ea660f46dd6c Mon Sep 17 00:00:00 2001
From: Kyle McMartin <kyle@redhat.com>
Date: Tue, 26 May 2009 12:27:34 -0400
Subject: [PATCH] --- yaml --- r: 163965 b: refs/heads/master c:
 d6073d775c4b26107351cb8d5e21cec4391f6314 h: refs/heads/master i:   163963:
 75d203d92b8cb729c9a808171f21f7045387fcd1 v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/gpu/drm/i915/i915_drv.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 9a9ee91d223e..e8d82ee8ac36 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 652c393a3368af84359da37c45afc35a91144960
+refs/heads/master: d6073d775c4b26107351cb8d5e21cec4391f6314
diff --git a/trunk/drivers/gpu/drm/i915/i915_drv.c b/trunk/drivers/gpu/drm/i915/i915_drv.c
index 81ab4883d898..dbe568c9327b 100644
--- a/trunk/drivers/gpu/drm/i915/i915_drv.c
+++ b/trunk/drivers/gpu/drm/i915/i915_drv.c
@@ -37,7 +37,7 @@
 #include <linux/console.h>
 #include "drm_crtc_helper.h"
 
-static unsigned int i915_modeset = -1;
+static int i915_modeset = -1;
 module_param_named(modeset, i915_modeset, int, 0400);
 
 unsigned int i915_fbpercrtc = 0;