Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 86b0905516460b87542686248690337e1d703544

Authored by Albert Wang
Committed by Mauro Carvalho Chehab
1 parent 4b71ca6bce
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

[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>

Showing 1 changed file with 3 additions and 3 deletions Side-by-side Diff

include/media/videobuf2-dma-contig.h
Diff comments   View file @ 86b0905
1 1 /*
2   - * videobuf2-dma-coherent.h - DMA coherent memory allocator for videobuf2
  2 + * videobuf2-dma-contig.h - DMA contig memory allocator for videobuf2
3 3 *
4 4 * Copyright (C) 2010 Samsung Electronics
5 5 *
... ... @@ -10,8 +10,8 @@
10 10 * the Free Software Foundation.
11 11 */
12 12  
13   -#ifndef _MEDIA_VIDEOBUF2_DMA_COHERENT_H
14   -#define _MEDIA_VIDEOBUF2_DMA_COHERENT_H
  13 +#ifndef _MEDIA_VIDEOBUF2_DMA_CONTIG_H
  14 +#define _MEDIA_VIDEOBUF2_DMA_CONTIG_H
15 15  
16 16 #include <media/videobuf2-core.h>
17 17 #include <linux/dma-mapping.h>