From 1aed6f91a92c5eb6fe4d9e9a852a45b0d0f37773 Mon Sep 17 00:00:00 2001
From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Tue, 24 Jul 2012 18:19:13 +1000
Subject: [PATCH] --- yaml --- r: 321095 b: refs/heads/master c:
 3f6a5580464bf000649f981970192c6c7fe739de h: refs/heads/master i:   321093:
 cbdf18a41d2a380b8ee0b5c95e40dd8dac39cc13   321091:
 17cf90f53c02eb3361d00b42284b430f5467a886   321087:
 db7025c55fd20854e5e5ba344ff16d8dbaaf1f3c v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/video/fb_draw.h | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 108724db1ebc..8f64605f5f1e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f7c848b6ef31af09925bb6f4c79e236ca9f94ed9
+refs/heads/master: 3f6a5580464bf000649f981970192c6c7fe739de
diff --git a/trunk/drivers/video/fb_draw.h b/trunk/drivers/video/fb_draw.h
index 04c01faaf772..624ee115f129 100644
--- a/trunk/drivers/video/fb_draw.h
+++ b/trunk/drivers/video/fb_draw.h
@@ -3,6 +3,7 @@
 
 #include <asm/types.h>
 #include <linux/fb.h>
+#include <linux/bug.h>
 
     /*
      *  Compose two values, using a bitmask as decision value
@@ -41,7 +42,8 @@ pixel_to_pat( u32 bpp, u32 pixel)
 	case 32:
 		return 0x0000000100000001ul*pixel;
 	default:
-		panic("pixel_to_pat(): unsupported pixelformat\n");
+		WARN(1, "pixel_to_pat(): unsupported pixelformat %d\n", bpp);
+		return 0;
     }
 }
 #else
@@ -66,7 +68,8 @@ pixel_to_pat( u32 bpp, u32 pixel)
 	case 32:
 		return 0x00000001ul*pixel;
 	default:
-		panic("pixel_to_pat(): unsupported pixelformat\n");
+		WARN(1, "pixel_to_pat(): unsupported pixelformat %d\n", bpp);
+		return 0;
     }
 }
 #endif