Merge tag 'sh-for-linus' of git://github.com/pmundt/linux-sh

[~andy/linux] / include / sound / emu10k1_synth.h

diff --git a/include/sound/emu10k1_synth.h b/include/sound/emu10k1_synth.h
index df0df1d0955210e0d27ef88c1c020e2edc106d55..6ef61c420935652f392d21fad80015cf3f6f4735 100644 (file)
--- 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 */