diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-10-24 22:11:17 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-10-24 22:11:17 -0700 |
| commit | 49327ad2bbbaf1945d5ba431522201574219d150 (patch) | |
| tree | 47beb374d0cfb77d401220f20e8cece4ce4469db /include/linux/gameport.h | |
| parent | f9ce6eb5b6fa8cbcf0a0fb7c5f4203f94730fc52 (diff) | |
| parent | 6521d0bf984ab1cc25795d312e21c438aea8b5d5 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'include/linux/gameport.h')
| -rw-r--r-- | include/linux/gameport.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/include/linux/gameport.h b/include/linux/gameport.h index 361d1cc288d0..b65a6f472775 100644 --- a/include/linux/gameport.h +++ b/include/linux/gameport.h @@ -53,9 +53,7 @@ struct gameport { #define to_gameport_port(d) container_of(d, struct gameport, dev) struct gameport_driver { - - void *private; - char *description; + const char *description; int (*connect)(struct gameport *, struct gameport_driver *drv); int (*reconnect)(struct gameport *); |