diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-23 00:40:54 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-23 00:40:54 +0000 |
| commit | 529c593ece216e4aaffd36bd940cb94f1fa63129 (patch) | |
| tree | 78f1c0b805f5656aa7b0417a043c5346f700a2cf /arch/m68k/atari | |
| parent | 0bd079751d25808d1972baee5c4eaa1db2227257 (diff) | |
Merge with 2.3.43. I did ignore all modifications to the qlogicisp.c
driver due to the Origin A64 hacks.
Diffstat (limited to 'arch/m68k/atari')
| -rw-r--r-- | arch/m68k/atari/joystick.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/arch/m68k/atari/joystick.c b/arch/m68k/atari/joystick.c index f8d965498..bf82e67ea 100644 --- a/arch/m68k/atari/joystick.c +++ b/arch/m68k/atari/joystick.c @@ -118,16 +118,11 @@ static unsigned int joystick_poll(struct file *file, poll_table *wait) } struct file_operations atari_joystick_fops = { - NULL, /* joystick_seek */ - read_joystick, - write_joystick, - NULL, /* joystick_readdir */ - joystick_poll, - NULL, /* joystick_ioctl */ - NULL, /* joystick_mmap */ - open_joystick, - NULL, /* flush */ - release_joystick + read: read_joystick, + write: write_joystick, + poll: joystick_poll, + open: open_joystick, + release: release_joystick, }; int __init atari_joystick_init(void) |