From fb6b6ab1a39302dbe1a2f972a956da8109e388ef Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Thu, 12 May 2011 22:17:21 +0100
Subject: [PATCH] --- yaml --- r: 253205 b: refs/heads/master c:
 4bce2da393dbbc6650a1d62683ef60e03594b4c7 h: refs/heads/master i:   253203:
 cd6496d67953d7bb2971b1f8b5f3ff94733cbbb9 v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/gpu/drm/i915/i915_drv.h | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index c1c555508b59..f39f92222c20 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c8ebc2b076ad9e1833cb4f7f1a6f30b4786a2a09
+refs/heads/master: 4bce2da393dbbc6650a1d62683ef60e03594b4c7
diff --git a/trunk/drivers/gpu/drm/i915/i915_drv.h b/trunk/drivers/gpu/drm/i915/i915_drv.h
index ee660355ae68..71bd6f559d3a 100644
--- a/trunk/drivers/gpu/drm/i915/i915_drv.h
+++ b/trunk/drivers/gpu/drm/i915/i915_drv.h
@@ -909,13 +909,6 @@ struct drm_i915_file_private {
 	} mm;
 };
 
-enum intel_chip_family {
-	CHIP_I8XX = 0x01,
-	CHIP_I9XX = 0x02,
-	CHIP_I915 = 0x04,
-	CHIP_I965 = 0x08,
-};
-
 #define INTEL_INFO(dev)	(((struct drm_i915_private *) (dev)->dev_private)->info)
 
 #define IS_I830(dev)		((dev)->pci_device == 0x3577)