diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-03 19:28:46 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-03 19:28:46 +0200 |
| commit | f68ec0c24755e5cdb779be6240925f2175311d84 (patch) | |
| tree | a7b7128e61a8456385d82bd1c7ca5f14eecbf2ca /drivers/video/sa1100fb.h | |
| parent | Revert "x86: fix ghost EDD devices in /sys again" (diff) | |
| parent | Linux 2.6.27-rc8 (diff) | |
| download | linux-f68ec0c24755e5cdb779be6240925f2175311d84.tar.xz linux-f68ec0c24755e5cdb779be6240925f2175311d84.zip | |
Merge commit 'v2.6.27-rc8' into x86/setup
Diffstat (limited to 'drivers/video/sa1100fb.h')
| -rw-r--r-- | drivers/video/sa1100fb.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/sa1100fb.h b/drivers/video/sa1100fb.h index f465b27ed860..86831db9a042 100644 --- a/drivers/video/sa1100fb.h +++ b/drivers/video/sa1100fb.h @@ -100,7 +100,7 @@ struct sa1100fb_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; |