diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-08-15 12:06:12 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-08-15 12:06:12 +0200 |
| commit | be750231ce1599b86fbba213e3da8344ece262e2 (patch) | |
| tree | a506c461082692bb5bab8b9bb63a762816329454 /drivers/gpu/drm/drm_irq.c | |
| parent | 18408ddc01136f505ae357c03f0d8e50b10e0db6 (diff) | |
| parent | 39e6dd73502f64e2ae3236b304e160ae30de9384 (diff) | |
Merge branch 'perfcounters/urgent' into perfcounters/core
Conflicts:
kernel/perf_counter.c
Merge reason: update to latest upstream (-rc6) and resolve
the conflict with urgent fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/gpu/drm/drm_irq.c')
| -rw-r--r-- | drivers/gpu/drm/drm_irq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c index b4a3dbcebe9b4..f85aaf21e7839 100644 --- a/drivers/gpu/drm/drm_irq.c +++ b/drivers/gpu/drm/drm_irq.c @@ -566,7 +566,7 @@ int drm_wait_vblank(struct drm_device *dev, void *data, ret = drm_vblank_get(dev, crtc); if (ret) { - DRM_ERROR("failed to acquire vblank counter, %d\n", ret); + DRM_DEBUG("failed to acquire vblank counter, %d\n", ret); return ret; } seq = drm_vblank_count(dev, crtc); |