Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs

[deliverable/linux.git] / include / sound / opl4.h

diff --git a/include/sound/opl4.h b/include/sound/opl4.h
index 20c04428b1392d747bb7e7904fb49b9458b6addb..60ae8454b3ce6bd6673383fb733053e7317243e2 100644 (file)
--- 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 */