diff options
| author | Thomas Hellstrom <thomas-at-tungstengraphics-dot-com> | 2006-08-28 09:28:10 +0200 |
|---|---|---|
| committer | Thomas Hellstrom <thomas-at-tungstengraphics-dot-com> | 2006-08-28 09:28:10 +0200 |
| commit | 4ddabd15620e6e4638a6a37a3a2b5bced626fcf9 (patch) | |
| tree | e0b6916c0d34c4cb7adbfa87c8438124a9acbba8 /linux-core/drm_lock.c | |
| parent | 886d3b3061cdf53f5a353cbaac843f63104d2658 (diff) | |
| parent | 9b984b34e99f694e10251e15bc2ec1bc844dcca4 (diff) | |
Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into drm-ttm-0-2-branch
Conflicts:
linux-core/drmP.h
Diffstat (limited to 'linux-core/drm_lock.c')
| -rw-r--r-- | linux-core/drm_lock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux-core/drm_lock.c b/linux-core/drm_lock.c index c12e4897..91fad8bf 100644 --- a/linux-core/drm_lock.c +++ b/linux-core/drm_lock.c @@ -104,7 +104,7 @@ int drm_lock(struct inode *inode, struct file *filp, __set_current_state(TASK_RUNNING); remove_wait_queue(&dev->lock.lock_queue, &entry); - DRM_DEBUG( "%d %s\n", lock.context, ret ? "interrupted" : "has lock" ); + DRM_DEBUG( "%d %s\n", lock.context, ret ? "interrupted" : "has lock" ); if (ret) return ret; sigemptyset(&dev->sigmask); |