aboutsummaryrefslogtreecommitdiffstats
path: root/include/sound/emu10k1_synth.h
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2006-01-17 10:26:28 -0500
committerJeff Garzik <jgarzik@pobox.com>2006-01-17 10:26:28 -0500
commit0825788ff27c7145e9d558cb2a26f3837d1f9be5 (patch)
treef6bdb892cec8ca0df69c08a3477c89f1542999e5 /include/sound/emu10k1_synth.h
parent02f693c7118f6be9e677070eb630c1f3a654cdd3 (diff)
parent1bc4ccfff8675adc3d96f91245eb7e2dc0043ca9 (diff)
downloadkernel_samsung_espresso10-0825788ff27c7145e9d558cb2a26f3837d1f9be5.zip
kernel_samsung_espresso10-0825788ff27c7145e9d558cb2a26f3837d1f9be5.tar.gz
kernel_samsung_espresso10-0825788ff27c7145e9d558cb2a26f3837d1f9be5.tar.bz2
Merge branch 'upstream'
Diffstat (limited to 'include/sound/emu10k1_synth.h')
-rw-r--r--include/sound/emu10k1_synth.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/sound/emu10k1_synth.h b/include/sound/emu10k1_synth.h
index df0df1d..6ef61c4 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 */