diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-03-29 17:18:49 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-03-29 17:18:49 -0500 |
| commit | e02a4cabfcb9a999b74a2e2e6f13ffcb7ff2d606 (patch) | |
| tree | 2f3db60be4c57eca2a4c3ab3f3122dcf1ec0c624 /include/linux/serio.h | |
| parent | 600511e86babe3727264a0883a3a264f6fb6caf5 (diff) | |
| parent | f3cab8a0b1a772dc8b055b7affa567a366627c9e (diff) | |
Merge branch 'master'
Diffstat (limited to 'include/linux/serio.h')
| -rw-r--r-- | include/linux/serio.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/serio.h b/include/linux/serio.h index aa4d6493a0..690aabca8e 100644 --- a/include/linux/serio.h +++ b/include/linux/serio.h | |||
| @@ -119,7 +119,7 @@ static inline void serio_cleanup(struct serio *serio) | |||
| 119 | } | 119 | } |
| 120 | 120 | ||
| 121 | /* | 121 | /* |
| 122 | * Use the following fucntions to manipulate serio's per-port | 122 | * Use the following functions to manipulate serio's per-port |
| 123 | * driver-specific data. | 123 | * driver-specific data. |
| 124 | */ | 124 | */ |
| 125 | static inline void *serio_get_drvdata(struct serio *serio) | 125 | static inline void *serio_get_drvdata(struct serio *serio) |
| @@ -133,7 +133,7 @@ static inline void serio_set_drvdata(struct serio *serio, void *data) | |||
| 133 | } | 133 | } |
| 134 | 134 | ||
| 135 | /* | 135 | /* |
| 136 | * Use the following fucntions to protect critical sections in | 136 | * Use the following functions to protect critical sections in |
| 137 | * driver code from port's interrupt handler | 137 | * driver code from port's interrupt handler |
| 138 | */ | 138 | */ |
| 139 | static inline void serio_pause_rx(struct serio *serio) | 139 | static inline void serio_pause_rx(struct serio *serio) |
| @@ -147,7 +147,7 @@ static inline void serio_continue_rx(struct serio *serio) | |||
| 147 | } | 147 | } |
| 148 | 148 | ||
| 149 | /* | 149 | /* |
| 150 | * Use the following fucntions to pin serio's driver in process context | 150 | * Use the following functions to pin serio's driver in process context |
| 151 | */ | 151 | */ |
| 152 | static inline int serio_pin_driver(struct serio *serio) | 152 | static inline int serio_pin_driver(struct serio *serio) |
| 153 | { | 153 | { |
