Update of /cvsroot/alsa/alsa-kernel/parisc
In directory sc8-pr-cvs1:/tmp/cvs-serv2571/parisc
Modified Files:
harmony.c
Log Message:
2.6 kernel sync
Index: harmony.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/parisc/harmony.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- harmony.c 25 Sep 2003 18:55:43 -0000 1.2
+++ harmony.c 1 Dec 2003 10:30:45 -0000 1.3
@@ -66,6 +66,7 @@
#include <linux/delay.h>
#include <sound/driver.h>
#include <linux/init.h>
+#include <linux/interrupt.h>
#include <linux/slab.h>
#include <linux/time.h>
#include <linux/wait.h>
@@ -77,8 +78,8 @@
#include <sound/initval.h>
#include <sound/info.h>
#include <asm/hardware.h>
-#include <asm/gsc.h>
#include <asm/io.h>
+#include <asm/parisc-device.h>
MODULE_AUTHOR("Laurent Canet <[EMAIL PROTECTED]>");
MODULE_DESCRIPTION("ALSA Harmony sound driver");
@@ -709,8 +710,8 @@
* harmony is not "real" pci, but we need a pci_dev
* to alloc PCI DMA pages
*/
- substream->dma_private = harmony->fake_pci_dev;
- substream->dma_type = SNDRV_PCM_DMA_TYPE_PCI;
+ substream->runtime->dma_private = harmony->fake_pci_dev;
+// substream->dma_type = SNDRV_PCM_DMA_TYPE_PCI;
harmony->playback_substream = substream;
runtime->hw = snd_card_harmony_playback;
@@ -733,8 +734,8 @@
* harmony is not "real" pci, but we need a pci_dev
* to alloc PCI DMA pages
*/
- substream->dma_private = harmony->fake_pci_dev;
- substream->dma_type = SNDRV_PCM_DMA_TYPE_PCI;
+ substream->runtime->dma_private = harmony->fake_pci_dev;
+// substream->dma_type = SNDRV_PCM_DMA_TYPE_PCI;
harmony->capture_substream = substream;
runtime->hw = snd_card_harmony_capture;
-------------------------------------------------------
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
