Merge git://git.kernel.org/pub/scm/linux/kernel/git/perex/alsa

1 files changed, 3 insertions, 3 deletions

diff --git a/include/sound/emu10k1_synth.h b/include/sound/emu10k1_synth.h
index df0df1d09552..6ef61c420935 100644
--- a/include/sound/emu10k1_synth.h
+++ b/include/sound/emu10k1_synth.h
@@ -27,12 +27,12 @@
 #define SNDRV_SEQ_DEV_ID_EMU10K1_SYNTH  "emu10k1-synth"
 
 /* argument for snd_seq_device_new */
-typedef struct snd_emu10k1_synth_arg {
-        emu10k1_t *hwptr;       /* chip */
+struct snd_emu10k1_synth_arg {
+        struct snd_emu10k1 *hwptr;      /* chip */
         int index;              /* sequencer client index */
         int seq_ports;          /* number of sequencer ports to be created */
         int max_voices;         /* maximum number of voices for wavetable */
-} snd_emu10k1_synth_arg_t;
+};
 
 #define EMU10K1_MAX_MEMSIZE     (32 * 1024 * 1024) /* 32MB */