From 6a26a4021fd6a7ab26d1f061498166df3b97d6a4 Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@linux-foundation.org>
Date: Mon, 1 Dec 2008 13:14:08 -0800
Subject: [PATCH] --- yaml --- r: 119540 b: refs/heads/master c:
 9c84ba4e502184d95ab75128d3166f595ea2dea0 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index da9ae697ecfd..33be5fc7faef 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 09a81269c7aadaec3375a7ebd9647acbb72f5a67
+refs/heads/master: 9c84ba4e502184d95ab75128d3166f595ea2dea0
diff --git a/trunk/drivers/gpu/drm/i915/i915_irq.c b/trunk/drivers/gpu/drm/i915/i915_irq.c
index fe3d9cc72bf5..69b9a42da95e 100644
--- a/trunk/drivers/gpu/drm/i915/i915_irq.c
+++ b/trunk/drivers/gpu/drm/i915/i915_irq.c
@@ -78,7 +78,7 @@ i915_pipestat(int pipe)
 		return PIPEASTAT;
 	if (pipe == 1)
 		return PIPEBSTAT;
-	BUG_ON(1);
+	BUG();
 }
 
 void