Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen...

[linux-2.6] / 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 14a9f7fe50aa57c54226d46feef81c48edf30617..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
 
@@ -89,3 +92,5 @@ static inline void ivtv_stream_sync_for_device(struct ivtv_stream *s)
                pci_dma_sync_single_for_device(s->itv->dev, s->sg_handle,
                        sizeof(struct ivtv_sg_element), PCI_DMA_TODEVICE);
 }
+
+#endif