summaryrefslogtreecommitdiff
path: root/include/media
diff options
context:
space:
mode:
authorAlbert Wang <twang13@marvell.com>2012-06-07 05:42:24 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-06-18 19:54:42 -0300
commit86b0905516460b87542686248690337e1d703544 (patch)
tree43a72e1df457545868309dfcc01da46bab0c197b /include/media
parent4b71ca6bce8fab3d08c61bf330e781f957934ae1 (diff)
downloadlinux-3.10-86b0905516460b87542686248690337e1d703544.tar.gz
linux-3.10-86b0905516460b87542686248690337e1d703544.tar.bz2
linux-3.10-86b0905516460b87542686248690337e1d703544.zip
[media] videobuf2: correct the #ifndef text mistake in videobuf2-dma-contig.h
It should be a mistake due to copy & paste in header file Correct it in videobuf2-dma-config.h for avoiding duplicate include it Change-Id: I1f71fcec2889c033c7db380c58d9a1369c5afb35 Signed-off-by: Albert Wang <twang13@marvell.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'include/media')
-rw-r--r--include/media/videobuf2-dma-contig.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/media/videobuf2-dma-contig.h b/include/media/videobuf2-dma-contig.h
index 19ae1e35056..8197f87d6c6 100644
--- a/include/media/videobuf2-dma-contig.h
+++ b/include/media/videobuf2-dma-contig.h
@@ -1,5 +1,5 @@
/*
- * videobuf2-dma-coherent.h - DMA coherent memory allocator for videobuf2
+ * videobuf2-dma-contig.h - DMA contig memory allocator for videobuf2
*
* Copyright (C) 2010 Samsung Electronics
*
@@ -10,8 +10,8 @@
* the Free Software Foundation.
*/
-#ifndef _MEDIA_VIDEOBUF2_DMA_COHERENT_H
-#define _MEDIA_VIDEOBUF2_DMA_COHERENT_H
+#ifndef _MEDIA_VIDEOBUF2_DMA_CONTIG_H
+#define _MEDIA_VIDEOBUF2_DMA_CONTIG_H
#include <media/videobuf2-core.h>
#include <linux/dma-mapping.h>