diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-04-04 08:41:29 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-04-04 08:41:29 -0400 |
commit | c16226a1c75042bfdc50bd2921d5919f6267ba51 (patch) | |
tree | f7f6081aab45d598fa44b9e588722ed38c299b8e /include/linux/libps2.h | |
parent | af64371ada9452632c349563d688d30d94e918ba (diff) | |
parent | 6246b6128bbe34d0752f119cf7c5111c85fe481d (diff) |
Merge branch 'master'
Diffstat (limited to 'include/linux/libps2.h')
-rw-r--r-- | include/linux/libps2.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/libps2.h b/include/linux/libps2.h index a710bddda4e..08a450a9dbf 100644 --- a/include/linux/libps2.h +++ b/include/linux/libps2.h @@ -28,7 +28,7 @@ struct ps2dev { struct serio *serio; /* Ensures that only one command is executing at a time */ - struct semaphore cmd_sem; + struct mutex cmd_mutex; /* Used to signal completion from interrupt handler */ wait_queue_head_t wait; |