From: Andrew Morton <akpm@linux-foundation.org>
Date: Mon, 1 Dec 2008 21:14:08 +0000 (-0800)
Subject: drivers/gpu/drm/i915/i915_irq.c: fix warning
X-Git-Tag: v2.6.28-rc7~2
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=9c84ba4e502184d95ab75128d3166f595ea2dea0;p=linux-2.6-omap-h63xx.git

drivers/gpu/drm/i915/i915_irq.c: fix warning

drivers/gpu/drm/i915/i915_irq.c: In function 'i915_disable_pipestat':
drivers/gpu/drm/i915/i915_irq.c:101: warning: control may reach end of non-void function 'i915_pipestat' being inlined

Cc: Dave Airlie <airlied@linux.ie>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index fe3d9cc72bf..69b9a42da95 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/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