From cd813c64bd28a06872edebd8f982e8ea4a2e764c Mon Sep 17 00:00:00 2001 From: Hannes Eder Date: Fri, 19 Dec 2008 12:34:27 +0100 Subject: [PATCH] --- yaml --- r: 123447 b: refs/heads/master c: d1e22c6ed05f3bfb3a7de0947498e7f3c868b296 h: refs/heads/master i: 123445: 716cd3f564af98c9a29aa7fe56e29ada0ba6e795 123443: 38442281a8a78bb5a81ded15ea01cee9c3c1c268 123439: b0e0bc2fbd1a518d0ab1f5b6ba0a31b3e8675bee v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/intel_fb.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) 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,