Update of /cvsroot/alsa/alsa-driver/pci/cs46xx
In directory sc8-pr-cvs1:/tmp/cvs-serv4448/cs46xx

Modified Files:
        .cvsignore Makefile 
Added Files:
        cs46xx.patch 
Removed Files:
        cs46xx.c 
Log Message:
clean up PM codes; moved the old part to patch

--- NEW FILE: cs46xx.patch ---
--- cs46xx.c    2003-06-10 15:29:36.000000000 +0200
+++ cs46xx.c.old        2003-06-10 15:29:26.000000000 +0200
@@ -163,6 +163,7 @@
 }
 
 #ifdef CONFIG_PM
+#ifndef PCI_OLD_SUSPEND
 static int snd_card_cs46xx_suspend(struct pci_dev *pci, u32 state)
 {
        cs46xx_t *chip = snd_magic_cast(cs46xx_t, pci_get_drvdata(pci), return -ENXIO);
@@ -175,6 +176,18 @@
        snd_cs46xx_resume(chip);
        return 0;
 }
+#else
+static void snd_card_cs46xx_suspend(struct pci_dev *pci)
+{
+       cs46xx_t *chip = snd_magic_cast(cs46xx_t, pci_get_drvdata(pci), return);
+       snd_cs46xx_suspend(chip);
+}
+static void snd_card_cs46xx_resume(struct pci_dev *pci)
+{
+       cs46xx_t *chip = snd_magic_cast(cs46xx_t, pci_get_drvdata(pci), return);
+       snd_cs46xx_resume(chip);
+}
+#endif
 #endif
 
 static void __devexit snd_card_cs46xx_remove(struct pci_dev *pci)
@@ -237,3 +250,4 @@
 __setup("snd-cs46xx=", alsa_card_cs46xx_setup);
 
 #endif /* ifndef MODULE */
+EXPORT_NO_SYMBOLS;

Index: .cvsignore
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/pci/cs46xx/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore  22 Dec 2001 20:46:15 -0000      1.1
+++ .cvsignore  18 Jun 2003 11:12:52 -0000      1.2
@@ -1 +1,2 @@
 .depend
+cs46xx.c

Index: Makefile
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/pci/cs46xx/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile    17 Dec 2002 19:59:00 -0000      1.4
+++ Makefile    18 Jun 2003 11:12:52 -0000      1.5
@@ -7,7 +7,11 @@
 EXTRA_CFLAGS = -DCONFIG_SND_CS46XX_NEW_DSP=1
 CONFIG_SND_CS46XX_NEW_DSP=y
 
+EXTRA_CLEAN = cs46xx.c
+
 TOPDIR = $(MAINSRCDIR)
 include $(TOPDIR)/alsa-kernel/pci/cs46xx/Makefile
 
 include $(TOPDIR)/Rules.make
+
+cs46xx.c: cs46xx.patch $(TOPDIR)/alsa-kernel/pci/cs46xx/cs46xx.c

--- cs46xx.c DELETED ---



-------------------------------------------------------
This SF.Net email is sponsored by: INetU
Attention Web Developers & Consultants: Become An INetU Hosting Partner.
Refer Dedicated Servers. We Manage Them. You Get 10% Monthly Commission!
INetU Dedicated Managed Hosting http://www.inetu.net/partner/index.php
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

Reply via email to