summaryrefslogtreecommitdiffstats
path: root/sound/arm/devdma.h
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2006-01-17 10:29:06 -0500
committerJeff Garzik <jgarzik@pobox.com>2006-01-17 10:29:06 -0500
commitea9b395fe20ac74be788f415af2622ac8f0c35c7 (patch)
treed1653e1a4cbe360aa7132ea4e29ab92a02038224 /sound/arm/devdma.h
parent61420e147a706ee7c7a902008045547fb2a2a330 (diff)
parent1bc4ccfff8675adc3d96f91245eb7e2dc0043ca9 (diff)
downloadlinux-ea9b395fe20ac74be788f415af2622ac8f0c35c7.tar.gz
linux-ea9b395fe20ac74be788f415af2622ac8f0c35c7.tar.bz2
linux-ea9b395fe20ac74be788f415af2622ac8f0c35c7.zip
Merge branch 'upstream'
Diffstat (limited to 'sound/arm/devdma.h')
-rw-r--r--sound/arm/devdma.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/arm/devdma.h b/sound/arm/devdma.h
index 5a33b6bacc34..d025329c8a0f 100644
--- a/sound/arm/devdma.h
+++ b/sound/arm/devdma.h
@@ -1,3 +1,3 @@
-void devdma_hw_free(struct device *dev, snd_pcm_substream_t *substream);
-int devdma_hw_alloc(struct device *dev, snd_pcm_substream_t *substream, size_t size);
-int devdma_mmap(struct device *dev, snd_pcm_substream_t *substream, struct vm_area_struct *vma);
+void devdma_hw_free(struct device *dev, struct snd_pcm_substream *substream);
+int devdma_hw_alloc(struct device *dev, struct snd_pcm_substream *substream, size_t size);
+int devdma_mmap(struct device *dev, struct snd_pcm_substream *substream, struct vm_area_struct *vma);