diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-31 12:43:41 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-31 12:43:41 -0400 |
| commit | 85e9ca333d03fbd56b9e123c8456f0d98e20faad (patch) | |
| tree | 7bb15ada5f536950efa23ad60ea9eea60380ca1c /include/linux/gameport.h | |
| parent | a300bec952127d9a15e666b391bb35c9aecb3002 (diff) | |
| parent | 6e86841d05f371b5b9b86ce76c02aaee83352298 (diff) | |
Merge branch 'linus' into timers/hpet
Diffstat (limited to 'include/linux/gameport.h')
| -rw-r--r-- | include/linux/gameport.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/gameport.h b/include/linux/gameport.h index afad95272841..f64e29c0ef3f 100644 --- a/include/linux/gameport.h +++ b/include/linux/gameport.h | |||
| @@ -68,7 +68,6 @@ struct gameport_driver { | |||
| 68 | 68 | ||
| 69 | int gameport_open(struct gameport *gameport, struct gameport_driver *drv, int mode); | 69 | int gameport_open(struct gameport *gameport, struct gameport_driver *drv, int mode); |
| 70 | void gameport_close(struct gameport *gameport); | 70 | void gameport_close(struct gameport *gameport); |
| 71 | void gameport_rescan(struct gameport *gameport); | ||
| 72 | 71 | ||
| 73 | #if defined(CONFIG_GAMEPORT) || (defined(MODULE) && defined(CONFIG_GAMEPORT_MODULE)) | 72 | #if defined(CONFIG_GAMEPORT) || (defined(MODULE) && defined(CONFIG_GAMEPORT_MODULE)) |
| 74 | 73 | ||