diff --git a/[refs] b/[refs]
index 00aca9a5d89e..f5af93541f33 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bae7ec657305def791a946f5d791054c48a5f081
+refs/heads/master: d1e22c6ed05f3bfb3a7de0947498e7f3c868b296
diff --git a/trunk/drivers/gpu/drm/i915/intel_fb.c b/trunk/drivers/gpu/drm/i915/intel_fb.c
index 3e38da0f6096..afd1217b8a02 100644
--- a/trunk/drivers/gpu/drm/i915/intel_fb.c
+++ b/trunk/drivers/gpu/drm/i915/intel_fb.c
@@ -414,15 +414,14 @@ EXPORT_SYMBOL(intelfb_resize);
 
 static struct drm_mode_set kernelfb_mode;
 
-int intelfb_panic(struct notifier_block *n, unsigned long ununsed,
-		  void *panic_str)
+static int intelfb_panic(struct notifier_block *n, unsigned long ununsed,
+			 void *panic_str)
 {
 	DRM_ERROR("panic occurred, switching back to text console\n");
 
 	intelfb_restore();
 	return 0;
 }
-EXPORT_SYMBOL(intelfb_panic);
 
 static struct notifier_block paniced = {
 	.notifier_call = intelfb_panic,