aboutsummaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/drm_fb_helper.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2011-09-20 22:15:55 +0200
committerArnd Bergmann <arnd@arndb.de>2011-09-20 22:15:55 +0200
commitda1c5afee092a2b51136ac3bf20c68bfff2924be (patch)
treefa71b9e3af25c870012a22e4cb72547f9aafcfd0 /drivers/gpu/drm/drm_fb_helper.c
parent1fdb4888e45f1413972a8e9da55f3ffc08b9abcb (diff)
parent4c59de052e7167a3bcf3f32c5ea4c9a5ef07386a (diff)
Merge branch 'samsung/cleanup' into next/cleanup
Diffstat (limited to 'drivers/gpu/drm/drm_fb_helper.c')
-rw-r--r--drivers/gpu/drm/drm_fb_helper.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c
index 802b61ac313..f7c6854eb4d 100644
--- a/drivers/gpu/drm/drm_fb_helper.c
+++ b/drivers/gpu/drm/drm_fb_helper.c
@@ -256,7 +256,6 @@ int drm_fb_helper_panic(struct notifier_block *n, unsigned long ununsed,
{
printk(KERN_ERR "panic occurred, switching back to text console\n");
return drm_fb_helper_force_kernel_mode();
- return 0;
}
EXPORT_SYMBOL(drm_fb_helper_panic);