summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-12-26 12:28:23 +0100
committerKukjin Kim <kgene.kim@samsung.com>2012-01-11 18:00:16 +0100
commit8ca0686aabbf145014fa22bc7fd06189b564f119 (patch)
treef390f83cd9844fb8367e5cf856c01483ab3f43ce /arch/arm
parentMerge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost (diff)
downloadlinux-8ca0686aabbf145014fa22bc7fd06189b564f119.tar.xz
linux-8ca0686aabbf145014fa22bc7fd06189b564f119.zip
ARM: SAMSUNG: Guard against multiple inclusion of plat/dma.h
Otherwise it'll generate errors if included twice. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/plat-samsung/include/plat/dma.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/plat-samsung/include/plat/dma.h b/arch/arm/plat-samsung/include/plat/dma.h
index b9061128abde..7b02143ccd9a 100644
--- a/arch/arm/plat-samsung/include/plat/dma.h
+++ b/arch/arm/plat-samsung/include/plat/dma.h
@@ -10,6 +10,9 @@
* published by the Free Software Foundation.
*/
+#ifndef __PLAT_DMA_H
+#define __PLAT_DMA_H
+
#include <linux/dma-mapping.h>
enum s3c2410_dma_buffresult {
@@ -122,5 +125,6 @@ extern int s3c2410_dma_getposition(enum dma_ch channel,
extern int s3c2410_dma_set_opfn(enum dma_ch, s3c2410_dma_opfn_t rtn);
extern int s3c2410_dma_set_buffdone_fn(enum dma_ch, s3c2410_dma_cbfn_t rtn);
-
#include <plat/dma-ops.h>
+
+#endif