From 2ace58bdf2220f8e89bec5fc3e7b01d5cd795ff8 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Mon, 7 Jun 2010 12:14:54 +1000 Subject: [PATCH] --- yaml --- r: 200225 b: refs/heads/master c: fc2362afd5ab9456caab4de317da796cc88944fe h: refs/heads/master i: 200223: cc5fa0ff97d7aa36f2c9dc4b3e161cb96c1414cd v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/drm_fb_helper.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 635fb4dbe772..91c6288cc6c8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9bad145ee2ef43ac36d397190a7d8b1a7306d3fb +refs/heads/master: fc2362afd5ab9456caab4de317da796cc88944fe diff --git a/trunk/drivers/gpu/drm/drm_fb_helper.c b/trunk/drivers/gpu/drm/drm_fb_helper.c index b3779d243aef..08c4c926e65f 100644 --- a/trunk/drivers/gpu/drm/drm_fb_helper.c +++ b/trunk/drivers/gpu/drm/drm_fb_helper.c @@ -264,7 +264,7 @@ bool drm_fb_helper_force_kernel_mode(void) int drm_fb_helper_panic(struct notifier_block *n, unsigned long ununsed, void *panic_str) { - DRM_ERROR("panic occurred, switching back to text console\n"); + printk(KERN_ERR "panic occurred, switching back to text console\n"); return drm_fb_helper_force_kernel_mode(); return 0; }