diff options
author | Jody McIntyre <scjody@modernduck.com> | 2006-01-05 08:03:40 -0500 |
---|---|---|
committer | Jody McIntyre <scjody@modernduck.com> | 2006-01-05 08:03:40 -0500 |
commit | 0a75c23a009ff65f651532cecc16675d05f4de37 (patch) | |
tree | bdcd6158758fe1810f0ddddb80d2816779518688 /include/sound/opl4.h | |
parent | 34b8c399dc04c8e51f014b73458e654570698597 (diff) | |
parent | db9edfd7e339ca4113153d887e782dd05be5a9eb (diff) | |
download | kernel-crypto-0a75c23a009ff65f651532cecc16675d05f4de37.tar.gz kernel-crypto-0a75c23a009ff65f651532cecc16675d05f4de37.tar.xz kernel-crypto-0a75c23a009ff65f651532cecc16675d05f4de37.zip |
Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'include/sound/opl4.h')
-rw-r--r-- | include/sound/opl4.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/sound/opl4.h b/include/sound/opl4.h index 20c04428b13..60ae8454b3c 100644 --- a/include/sound/opl4.h +++ b/include/sound/opl4.h @@ -22,11 +22,11 @@ #include <sound/opl3.h> -typedef struct opl4 opl4_t; +struct snd_opl4; -extern int snd_opl4_create(snd_card_t *card, +extern int snd_opl4_create(struct snd_card *card, unsigned long fm_port, unsigned long pcm_port, int seq_device, - opl3_t **opl3, opl4_t **opl4); + struct snd_opl3 **opl3, struct snd_opl4 **opl4); #endif /* __SOUND_OPL4_H */ |