summaryrefslogtreecommitdiffstats
path: root/drivers/sound/waveartist.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-11-28 03:58:46 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-11-28 03:58:46 +0000
commitb63ad0882a16a5d28003e57f2b0b81dee3fb322b (patch)
tree0a343ce219e2b8b38a5d702d66032c57b83d9720 /drivers/sound/waveartist.c
parenta9d7bff9a84dba79609a0002e5321b74c4d64c64 (diff)
Merge with 2.4.0-test11.
Diffstat (limited to 'drivers/sound/waveartist.c')
-rw-r--r--drivers/sound/waveartist.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/sound/waveartist.c b/drivers/sound/waveartist.c
index 5e4f6c34d..be7b9afbc 100644
--- a/drivers/sound/waveartist.c
+++ b/drivers/sound/waveartist.c
@@ -17,6 +17,10 @@
* OSS/Free for Linux is distributed under the GNU GENERAL PUBLIC LICENSE (GPL)
* Version 2 (June 1991). See the "COPYING" file distributed with this software
* for more info.
+ *
+ * Changes:
+ * 11-10-2000 Bartlomiej Zolnierkiewicz <bkz@linux-ide.org>
+ * Added __init to waveartist_init()
*/
/* Debugging */
@@ -1190,8 +1194,7 @@ static struct mixer_operations waveartist_mixer_operations =
ioctl: waveartist_mixer_ioctl
};
-static int
-waveartist_init(wavnc_info *devc)
+static int __init waveartist_init(wavnc_info *devc)
{
wavnc_port_info *portc;
char rev[3], dev_name[64];