Merge ../linux-2.6

[linux-2.6-omap-h63xx.git] / drivers / media / video / ivtv / ivtv-queue.h

diff --git a/drivers/media/video/ivtv/ivtv-queue.h b/drivers/media/video/ivtv/ivtv-queue.h
index 2ed8d548255d95f58b31bdc38e8db9df63e1cc2b..7cfc0c9ab050ca781386068ea3c1f0fd1d671e25 100644 (file)
--- a/drivers/media/video/ivtv/ivtv-queue.h
+++ b/drivers/media/video/ivtv/ivtv-queue.h
@@ -19,6 +19,9 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#ifndef IVTV_QUEUE_H
+#define IVTV_QUEUE_H
+
 #define IVTV_DMA_UNMAPPED      ((u32) -1)
 #define SLICED_VBI_PIO 1
 
@@ -79,13 +82,15 @@ void ivtv_stream_free(struct ivtv_stream *s);
 static inline void ivtv_stream_sync_for_cpu(struct ivtv_stream *s)
 {
        if (ivtv_use_dma(s))
-               pci_dma_sync_single_for_cpu(s->itv->dev, s->SG_handle,
-                       sizeof(struct ivtv_SG_element) * s->buffers, PCI_DMA_TODEVICE);
+               pci_dma_sync_single_for_cpu(s->itv->dev, s->sg_handle,
+                       sizeof(struct ivtv_sg_element), PCI_DMA_TODEVICE);
 }
 
 static inline void ivtv_stream_sync_for_device(struct ivtv_stream *s)
 {
        if (ivtv_use_dma(s))
-               pci_dma_sync_single_for_device(s->itv->dev, s->SG_handle,
-                       sizeof(struct ivtv_SG_element) * s->buffers, PCI_DMA_TODEVICE);
+               pci_dma_sync_single_for_device(s->itv->dev, s->sg_handle,
+                       sizeof(struct ivtv_sg_element), PCI_DMA_TODEVICE);
 }
+
+#endif