Update of /cvsroot/alsa/alsa-kernel/pci
In directory sc8-pr-cvs1:/tmp/cvs-serv2571/pci
Modified Files:
Kconfig cmipci.c
Log Message:
2.6 kernel sync
Index: Kconfig
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pci/Kconfig,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Kconfig 29 Sep 2003 07:31:25 -0000 1.9
+++ Kconfig 1 Dec 2003 10:30:45 -0000 1.10
@@ -17,7 +17,8 @@
config SND_CS46XX
tristate "Cirrus Logic (Sound Fusion) CS4280/CS461x/CS462x/CS463x"
- depends on SND && GAMEPORT
+ depends on SND
+ select GAMEPORT
help
Say 'Y' or 'M' to include support for Cirrus Logic CS4610 / CS4612 /
CS4614 / CS4615 / CS4622 / CS4624 / CS4630 / CS4280 chips.
Index: cmipci.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pci/cmipci.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- cmipci.c 7 Nov 2003 19:38:09 -0000 1.53
+++ cmipci.c 1 Dec 2003 10:30:45 -0000 1.54
@@ -2823,6 +2823,7 @@
* proc interface
*/
+#ifdef CONFIG_PROC_FS
static void snd_cmipci_proc_read(snd_info_entry_t *entry,
snd_info_buffer_t *buffer)
{
@@ -2849,6 +2850,9 @@
if (! snd_card_proc_new(cm->card, "cmipci", &entry))
snd_info_set_text_ops(entry, cm, 1024, snd_cmipci_proc_read);
}
+#else /* !CONFIG_PROC_FS */
+static inline void snd_cmipci_proc_init(cmipci_t *cm) {}
+#endif
static struct pci_device_id snd_cmipci_ids[] = {
-------------------------------------------------------
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive? Does it
help you create better code? SHARE THE LOVE, and help us help
YOU! Click Here: http://sourceforge.net/donate/
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
