From 6d70fa63ae9d657c47372c917e795c0e1dd96ea1 Mon Sep 17 00:00:00 2001 From: Daniel Vetter Date: Sun, 20 Jan 2013 18:18:07 +0100 Subject: [PATCH] --- yaml --- r: 358171 b: refs/heads/master c: 43c8a849a1e92fba6ea4493ed950d2a2e31ac87c h: refs/heads/master i: 358169: cbfdea69cb1ce2a5b9a85675d141c6bae85dfb45 358167: 86f46a34ec4448b51cabe022ecce17ba9428761c v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/drm_fb_helper.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 6655cee273a4..99ed3e95cbb2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d21bf469d5301d025cd82997bb1529bcdc7086af +refs/heads/master: 43c8a849a1e92fba6ea4493ed950d2a2e31ac87c diff --git a/trunk/drivers/gpu/drm/drm_fb_helper.c b/trunk/drivers/gpu/drm/drm_fb_helper.c index 14a81fc3e01a..eaab092b995d 100644 --- a/trunk/drivers/gpu/drm/drm_fb_helper.c +++ b/trunk/drivers/gpu/drm/drm_fb_helper.c @@ -287,7 +287,7 @@ static bool drm_fb_helper_force_kernel_mode(void) return error; } -int drm_fb_helper_panic(struct notifier_block *n, unsigned long ununsed, +static int drm_fb_helper_panic(struct notifier_block *n, unsigned long ununsed, void *panic_str) { /* @@ -300,7 +300,6 @@ int drm_fb_helper_panic(struct notifier_block *n, unsigned long ununsed, pr_err("panic occurred, switching back to text console\n"); return drm_fb_helper_force_kernel_mode(); } -EXPORT_SYMBOL(drm_fb_helper_panic); static struct notifier_block paniced = { .notifier_call = drm_fb_helper_panic,