diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
| commit | d6434e1042f3b0a6dfe1b1f615af369486f9b1fa (patch) | |
| tree | e2be02f33984c48ec019c654051d27964e42c441 /arch/m68k/atari/joystick.c | |
| parent | 609d1e803baf519487233b765eb487f9ec227a18 (diff) | |
Merge with 2.3.19.
Diffstat (limited to 'arch/m68k/atari/joystick.c')
| -rw-r--r-- | arch/m68k/atari/joystick.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/m68k/atari/joystick.c b/arch/m68k/atari/joystick.c index ba5dbcd98..f8d965498 100644 --- a/arch/m68k/atari/joystick.c +++ b/arch/m68k/atari/joystick.c @@ -130,11 +130,12 @@ struct file_operations atari_joystick_fops = { release_joystick }; -__initfunc(int atari_joystick_init(void)) +int __init atari_joystick_init(void) { joystick[0].active = joystick[1].active = 0; joystick[0].ready = joystick[1].ready = 0; - joystick[0].wait = joystick[1].wait = NULL; + init_waitqueue_head(&joystick[0].wait); + init_waitqueue_head(&joystick[1].wait); if (register_chrdev(MAJOR_NR, "Joystick", &atari_joystick_fops)) printk("unable to get major %d for joystick devices\n", MAJOR_NR); |