diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-04-12 17:52:52 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-04-12 17:52:52 -0400 |
commit | 32ea89ecb25789b1b7db28146558587a42f3b372 (patch) | |
tree | c5b3b33523b353f2eab2d8dcd2b3f069826cdc48 /include/linux/libps2.h | |
parent | 58a7ce64426394a46e80cdc9440cc1e7c195e85d (diff) | |
parent | a145410dccdb44f81d3b56763ef9b6f721f4e47c (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; |