From 9447ee0b49ff470ffee2cbf2110a91a88069d992 Mon Sep 17 00:00:00 2001
From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Tue, 19 Jun 2012 16:52:32 +0200
Subject: [PATCH] --- yaml --- r: 318607 b: refs/heads/master c:
 6f4c45c12c6775b8158fc143115037d084df12c3 h: refs/heads/master i:   318605:
 d79368755e71b5a8fbe459530cf4f6922afac0ba   318603:
 e3d52b623e860c0c122a1730e2193d192879b0f6   318599:
 dec65da3eb66998ea9e9ae50d5540043483e6edf   318591:
 d85e516b7629620eb5971c266bc8e290c7cedd2c v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/gpu/drm/i915/i915_gem_context.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 05c3606b2083..85b732aeb3c1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0d326013763bd4610cb72d9e2fa7f8ff2f414995
+refs/heads/master: 6f4c45c12c6775b8158fc143115037d084df12c3
diff --git a/trunk/drivers/gpu/drm/i915/i915_gem_context.c b/trunk/drivers/gpu/drm/i915/i915_gem_context.c
index f775d861f052..a52fd21e4807 100644
--- a/trunk/drivers/gpu/drm/i915/i915_gem_context.c
+++ b/trunk/drivers/gpu/drm/i915/i915_gem_context.c
@@ -485,7 +485,6 @@ int i915_switch_context(struct intel_ring_buffer *ring,
 int i915_gem_context_create_ioctl(struct drm_device *dev, void *data,
 				  struct drm_file *file)
 {
-	struct drm_i915_private *dev_priv = dev->dev_private;
 	struct drm_i915_gem_context_create *args = data;
 	struct drm_i915_file_private *file_priv = file->driver_priv;
 	struct i915_hw_context *ctx;
@@ -512,7 +511,6 @@ int i915_gem_context_destroy_ioctl(struct drm_device *dev, void *data,
 {
 	struct drm_i915_gem_context_destroy *args = data;
 	struct drm_i915_file_private *file_priv = file->driver_priv;
-	struct drm_i915_private *dev_priv = dev->dev_private;
 	struct i915_hw_context *ctx;
 	int ret;