diff options
author | Steve French <sfrench@us.ibm.com> | 2006-06-25 17:57:32 +0200 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2006-06-25 17:57:32 +0200 |
commit | bbe5d235ee201705530a7153b57e141cd77d818b (patch) | |
tree | e98c31b4cb2ced6357a87a02596f9ecdbd6dbb26 /sound/pci/trident/trident_synth.c | |
parent | [CIFS] Enable sec flags on mount for cifs (part one) (diff) | |
parent | Merge master.kernel.org:/home/rmk/linux-2.6-arm (diff) | |
download | linux-bbe5d235ee201705530a7153b57e141cd77d818b.tar.xz linux-bbe5d235ee201705530a7153b57e141cd77d818b.zip |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'sound/pci/trident/trident_synth.c')
-rw-r--r-- | sound/pci/trident/trident_synth.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/pci/trident/trident_synth.c b/sound/pci/trident/trident_synth.c index cc7af8bc55a0..9b7dee84743b 100644 --- a/sound/pci/trident/trident_synth.c +++ b/sound/pci/trident/trident_synth.c @@ -914,7 +914,9 @@ static int snd_trident_synth_create_port(struct snd_trident * trident, int idx) &callbacks, SNDRV_SEQ_PORT_CAP_WRITE | SNDRV_SEQ_PORT_CAP_SUBS_WRITE, SNDRV_SEQ_PORT_TYPE_DIRECT_SAMPLE | - SNDRV_SEQ_PORT_TYPE_SYNTH, + SNDRV_SEQ_PORT_TYPE_SYNTH | + SNDRV_SEQ_PORT_TYPE_HARDWARE | + SNDRV_SEQ_PORT_TYPE_SYNTHESIZER, 16, 0, name); if (p->chset->port < 0) { |