diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-04-02 00:08:05 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-04-02 00:08:05 -0500 |
| commit | 95d465fd750897ab32462a6702fbfe1b122cbbc0 (patch) | |
| tree | 65c38b2f11c51bb6932e44dd6c92f15b0091abfe /include/linux/gameport.h | |
| parent | 642fde17dceceb56c7ba2762733ac688666ae657 (diff) | |
| parent | 683aa4012f53b2ada0f430487e05d37b0d94e90a (diff) | |
Manual merge with Linus.
Conflicts:
arch/powerpc/kernel/setup-common.c
drivers/input/keyboard/hil_kbd.c
drivers/input/mouse/hil_ptr.c
Diffstat (limited to 'include/linux/gameport.h')
| -rw-r--r-- | include/linux/gameport.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/gameport.h b/include/linux/gameport.h index 3e1b9b285258..71e7b2847cb3 100644 --- a/include/linux/gameport.h +++ b/include/linux/gameport.h | |||
| @@ -120,7 +120,7 @@ static inline void gameport_set_name(struct gameport *gameport, const char *name | |||
| 120 | } | 120 | } |
| 121 | 121 | ||
| 122 | /* | 122 | /* |
| 123 | * Use the following fucntions to manipulate gameport's per-port | 123 | * Use the following functions to manipulate gameport's per-port |
| 124 | * driver-specific data. | 124 | * driver-specific data. |
| 125 | */ | 125 | */ |
| 126 | static inline void *gameport_get_drvdata(struct gameport *gameport) | 126 | static inline void *gameport_get_drvdata(struct gameport *gameport) |
| @@ -134,7 +134,7 @@ static inline void gameport_set_drvdata(struct gameport *gameport, void *data) | |||
| 134 | } | 134 | } |
| 135 | 135 | ||
| 136 | /* | 136 | /* |
| 137 | * Use the following fucntions to pin gameport's driver in process context | 137 | * Use the following functions to pin gameport's driver in process context |
| 138 | */ | 138 | */ |
| 139 | static inline int gameport_pin_driver(struct gameport *gameport) | 139 | static inline int gameport_pin_driver(struct gameport *gameport) |
| 140 | { | 140 | { |