diff options
| author | Matthias Kaehlcke <matthias.kaehlcke@gmail.com> | 2008-02-06 04:36:25 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-06 13:41:01 -0500 |
| commit | 0a5dcb51770be3cd0202d6b90a07996fb40130b6 (patch) | |
| tree | 75ac6d5c64be71369126e8ad05b62b59576df4e7 /include/linux | |
| parent | 8f47f0b688bba7642dac4e979896e4692177670b (diff) | |
Parallel port: convert port_mutex to the mutex API
Parallel port: Convert port_mutex to the mutex API
[akpm@linux-foundation.org: coding-style fixes]
Signed-off-by: Matthias Kaehlcke <matthias.kaehlcke@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/lp.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/lp.h b/include/linux/lp.h index 7059b6b9878a..0df024bfd6f0 100644 --- a/include/linux/lp.h +++ b/include/linux/lp.h | |||
| @@ -99,7 +99,7 @@ | |||
| 99 | #ifdef __KERNEL__ | 99 | #ifdef __KERNEL__ |
| 100 | 100 | ||
| 101 | #include <linux/wait.h> | 101 | #include <linux/wait.h> |
| 102 | #include <asm/semaphore.h> | 102 | #include <linux/mutex.h> |
| 103 | 103 | ||
| 104 | /* Magic numbers for defining port-device mappings */ | 104 | /* Magic numbers for defining port-device mappings */ |
| 105 | #define LP_PARPORT_UNSPEC -4 | 105 | #define LP_PARPORT_UNSPEC -4 |
| @@ -145,7 +145,7 @@ struct lp_struct { | |||
| 145 | #endif | 145 | #endif |
| 146 | wait_queue_head_t waitq; | 146 | wait_queue_head_t waitq; |
| 147 | unsigned int last_error; | 147 | unsigned int last_error; |
| 148 | struct semaphore port_mutex; | 148 | struct mutex port_mutex; |
| 149 | wait_queue_head_t dataq; | 149 | wait_queue_head_t dataq; |
| 150 | long timeout; | 150 | long timeout; |
| 151 | unsigned int best_mode; | 151 | unsigned int best_mode; |
