patch-2.2.19 linux/drivers/sound/sound_core.c
Next file: linux/drivers/sound/trident.c
Previous file: linux/drivers/sound/sonicvibes.c
Back to the patch index
Back to the overall index
- Lines: 46
- Date:
Sun Mar 25 11:37:37 2001
- Orig file:
v2.2.18/drivers/sound/sound_core.c
- Orig date:
Sun Mar 25 11:28:31 2001
diff -u --new-file --recursive --exclude-from /usr/src/exclude v2.2.18/drivers/sound/sound_core.c linux/drivers/sound/sound_core.c
@@ -52,6 +52,7 @@
struct sound_unit *next;
};
+extern int init_cmpci(void);
extern int init_sonicvibes(void);
extern int init_maestro(void);
extern int init_trident(void);
@@ -63,7 +64,6 @@
extern int init_solo1(void);
extern int init_ymf7xxsb_module(void);
extern int cs_probe(void);
-extern int init_emu10k1(void);
extern int cs4281_probe(void);
extern void init_vwsnd(void);
extern int ymf_probe(void);
@@ -396,6 +396,9 @@
/*
* Now init non OSS drivers
*/
+#ifdef CONFIG_SOUND_CMPCI
+ init_cmpci();
+#endif
#ifdef CONFIG_SOUND_VWSND
init_vwsnd();
#endif
@@ -411,6 +414,9 @@
#ifdef CONFIG_SOUND_MAESTRO
init_maestro();
#endif
+#ifdef CONFIG_SOUND_MAESTRO3
+ init_maestro3();
+#endif
#ifdef CONFIG_SOUND_TRIDENT
init_trident();
#endif
@@ -434,9 +440,6 @@
#endif
#ifdef CONFIG_SOUND_CS4281
cs4281_probe();
-#endif
-#ifdef CONFIG_SOUND_EMU10K1
- init_emu10k1();
#endif
#ifdef CONFIG_SOUND_YMFPCI
ymf_probe();
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)