Merge branch 'merge' of ssh://master.kernel.org/pub/scm/linux/kernel/git/jwboyer...

[~andy/linux] / drivers / video / pxafb.h

diff --git a/drivers/video/pxafb.h b/drivers/video/pxafb.h
index 8238dc8264297fb42c1b2b40226fb64edfb53c32..31541b86f13d2d0e509fb9649342fbcb7b666126 100644 (file)
--- a/drivers/video/pxafb.h
+++ b/drivers/video/pxafb.h
@@ -106,7 +106,7 @@ struct pxafb_info {
 
        volatile u_char         state;
        volatile u_char         task_state;
-       struct semaphore        ctrlr_sem;
+       struct mutex            ctrlr_lock;
        wait_queue_head_t       ctrlr_wait;
        struct work_struct      task;