summaryrefslogtreecommitdiffstats
path: root/arch/arm/include
diff options
context:
space:
mode:
authorKukjin Kim <kgene.kim@samsung.com>2011-10-04 18:57:38 +0900
committerKukjin Kim <kgene.kim@samsung.com>2011-10-04 18:57:38 +0900
commit59ca37f74a6e9d3e9367359f2fcbb286df7d9748 (patch)
treecbc0254ef952f10e99e384b56ccc7b81389e335e /arch/arm/include
parent7d84b3e93757fe871d57b43c422b81cc8b94057a (diff)
parentc9312209aa9fdef05b03d63bbead63bb720fd133 (diff)
downloadblackbird-op-linux-59ca37f74a6e9d3e9367359f2fcbb286df7d9748.tar.gz
blackbird-op-linux-59ca37f74a6e9d3e9367359f2fcbb286df7d9748.zip
Merge branch 'next/topic-dma-samsung' into next-samsung-devel
Diffstat (limited to 'arch/arm/include')
-rw-r--r--arch/arm/include/asm/hardware/pl080.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/include/asm/hardware/pl080.h b/arch/arm/include/asm/hardware/pl080.h
index e4a04e4e5627..33c78d7af2e1 100644
--- a/arch/arm/include/asm/hardware/pl080.h
+++ b/arch/arm/include/asm/hardware/pl080.h
@@ -21,6 +21,9 @@
* OneNAND features.
*/
+#ifndef ASM_PL080_H
+#define ASM_PL080_H
+
#define PL080_INT_STATUS (0x00)
#define PL080_TC_STATUS (0x04)
#define PL080_TC_CLEAR (0x08)
@@ -138,3 +141,4 @@ struct pl080s_lli {
u32 control1;
};
+#endif /* ASM_PL080_H */
OpenPOWER on IntegriCloud