Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 123447
b: refs/heads/master
c: d1e22c6
h: refs/heads/master
i:
  123445: 716cd3f
  123443: 3844228
  123439: b0e0bc2
v: v3
  • Loading branch information
Hannes Eder authored and Dave Airlie committed Dec 29, 2008
1 parent 6f6c7d8 commit cd813c6
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: bae7ec657305def791a946f5d791054c48a5f081
refs/heads/master: d1e22c6ed05f3bfb3a7de0947498e7f3c868b296
5 changes: 2 additions & 3 deletions trunk/drivers/gpu/drm/i915/intel_fb.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit cd813c6

Please sign in to comment.