diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-01 00:18:17 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-01 00:18:17 -0500 |
commit | d20e6336ea4250e51081e4b2924b9ef4dfa45909 (patch) | |
tree | 96c22694bec10912d40a3700a945157597dd901b /drivers/input/joystick/twidjoy.c | |
parent | fa3c791d85aa9a363dd72dd834b73b79252ef44e (diff) | |
parent | 6dea93477c3377cf4199fd37cc3fb11071987ae4 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/dtor/input
Diffstat (limited to 'drivers/input/joystick/twidjoy.c')
-rw-r--r-- | drivers/input/joystick/twidjoy.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/joystick/twidjoy.c b/drivers/input/joystick/twidjoy.c index cd3a1e742a30..7f8b0093c5bc 100644 --- a/drivers/input/joystick/twidjoy.c +++ b/drivers/input/joystick/twidjoy.c | |||
@@ -265,13 +265,13 @@ static struct serio_driver twidjoy_drv = { | |||
265 | * The functions for inserting/removing us as a module. | 265 | * The functions for inserting/removing us as a module. |
266 | */ | 266 | */ |
267 | 267 | ||
268 | int __init twidjoy_init(void) | 268 | static int __init twidjoy_init(void) |
269 | { | 269 | { |
270 | serio_register_driver(&twidjoy_drv); | 270 | serio_register_driver(&twidjoy_drv); |
271 | return 0; | 271 | return 0; |
272 | } | 272 | } |
273 | 273 | ||
274 | void __exit twidjoy_exit(void) | 274 | static void __exit twidjoy_exit(void) |
275 | { | 275 | { |
276 | serio_unregister_driver(&twidjoy_drv); | 276 | serio_unregister_driver(&twidjoy_drv); |
277 | } | 277 | } |