Merge branch 'for-james' of git://github.com/srajiv/tpm into next

[~andy/linux] / sound / isa / sb / emu8000_synth.c

diff --git a/sound/isa/sb/emu8000_synth.c b/sound/isa/sb/emu8000_synth.c
index f68e217416a6f8ad8a8228739f5a129e910e86f9..4e3fcfb15ad4a98eea8c06d97b77e1655e469d50 100644 (file)
--- a/sound/isa/sb/emu8000_synth.c
+++ b/sound/isa/sb/emu8000_synth.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *     and (c) 1999 Steve Ratcliffe <steve@parabola.demon.co.uk>
  *  Copyright (C) 1999-2000 Takashi Iwai <tiwai@suse.de>
  *
@@ -22,6 +22,7 @@
 
 #include "emu8000_local.h"
 #include <linux/init.h>
+#include <linux/module.h>
 #include <sound/initval.h>
 
 MODULE_AUTHOR("Takashi Iwai, Steve Ratcliffe");
@@ -33,12 +34,12 @@ MODULE_LICENSE("GPL");
 /*
  * create a new hardware dependent device for Emu8000
  */
-static int snd_emu8000_new_device(snd_seq_device_t *dev)
+static int snd_emu8000_new_device(struct snd_seq_device *dev)
 {
-       emu8000_t *hw;
-       snd_emux_t *emu;
+       struct snd_emu8000 *hw;
+       struct snd_emux *emu;
 
-       hw = *(emu8000_t**)SNDRV_SEQ_DEVICE_ARGPTR(dev);
+       hw = *(struct snd_emu8000**)SNDRV_SEQ_DEVICE_ARGPTR(dev);
        if (hw == NULL)
                return -EINVAL;
 
@@ -92,9 +93,9 @@ static int snd_emu8000_new_device(snd_seq_device_t *dev)
 /*
  * free all resources
  */
-static int snd_emu8000_delete_device(snd_seq_device_t *dev)
+static int snd_emu8000_delete_device(struct snd_seq_device *dev)
 {
-       emu8000_t *hw;
+       struct snd_emu8000 *hw;
 
        if (dev->driver_data == NULL)
                return 0; /* no synth was allocated actually */
@@ -118,11 +119,12 @@ static int snd_emu8000_delete_device(snd_seq_device_t *dev)
 static int __init alsa_emu8000_init(void)
 {
        
-       static snd_seq_dev_ops_t ops = {
+       static struct snd_seq_dev_ops ops = {
                snd_emu8000_new_device,
                snd_emu8000_delete_device,
        };
-       return snd_seq_device_register_driver(SNDRV_SEQ_DEV_ID_EMU8000, &ops, sizeof(emu8000_t*));
+       return snd_seq_device_register_driver(SNDRV_SEQ_DEV_ID_EMU8000, &ops,
+                                             sizeof(struct snd_emu8000*));
 }
 
 static void __exit alsa_emu8000_exit(void)