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 /drivers/sbus/audio/audio.c | |
| 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 'drivers/sbus/audio/audio.c')
| -rw-r--r-- | drivers/sbus/audio/audio.c | 36 |
1 files changed, 11 insertions, 25 deletions
diff --git a/drivers/sbus/audio/audio.c b/drivers/sbus/audio/audio.c index 2d5dd31a1..62d295a8e 100644 --- a/drivers/sbus/audio/audio.c +++ b/drivers/sbus/audio/audio.c @@ -1,4 +1,4 @@ -/* $Id: audio.c,v 1.47 1999/12/15 22:30:16 davem Exp $ +/* $Id: audio.c,v 1.48 2000/02/09 22:33:19 davem Exp $ * drivers/sbus/audio/audio.c * * Copyright 1996 Thomas K. Dyas (tdyas@noc.rutgers.edu) @@ -1959,18 +1959,9 @@ static void sparcaudioctl_release(struct inode * inode, struct file * file) #endif static struct file_operations sparcaudioctl_fops = { - NULL, - NULL, - NULL, - NULL, /* sparcaudio_readdir */ - sparcaudio_select, - sparcaudio_ioctl, - NULL, /* sparcaudio_mmap */ - NULL, -#if defined (LINUX_VERSION_CODE) && LINUX_VERSION_CODE > 0x200ff - NULL, /* sparcaudio_flush */ -#endif - sparcaudioctl_release, + poll: sparcaudio_select, + ioctl: sparcaudio_ioctl, + release: sparcaudioctl_release, }; static int sparcaudio_open(struct inode * inode, struct file * file) @@ -2170,18 +2161,13 @@ static void sparcaudio_release(struct inode * inode, struct file * file) #endif static struct file_operations sparcaudio_fops = { - sparcaudio_lseek, - sparcaudio_read, - sparcaudio_write, - NULL, /* sparcaudio_readdir */ - sparcaudio_select, - sparcaudio_ioctl, - NULL, /* sparcaudio_mmap */ - sparcaudio_open, -#if defined (LINUX_VERSION_CODE) && LINUX_VERSION_CODE > 0x200ff - NULL, /* sparcaudio_flush */ -#endif - sparcaudio_release + llseek: sparcaudio_lseek, + read: sparcaudio_read, + write: sparcaudio_write, + poll: sparcaudio_select, + ioctl: sparcaudio_ioctl, + open: sparcaudio_open, + release: sparcaudio_release, }; #if defined (LINUX_VERSION_CODE) && LINUX_VERSION_CODE < 0x20100 |