diff options
| author | Vinod Koul <vinod.koul@linux.intel.com> | 2011-09-02 11:13:44 (GMT) |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2011-09-02 11:13:44 (GMT) |
| commit | 8516f52fa497b37eb3d5e58d34e61a41ae0a553a (patch) | |
| tree | b73175b134d36bea303d2f181ae89a448c2add81 /arch | |
| parent | c6a389f123b9f68d605bb7e0f9b32ec1e3e14132 (diff) | |
| parent | 7b4b88e067d37cbbafd856121767f7e154294eb2 (diff) | |
| download | linux-8516f52fa497b37eb3d5e58d34e61a41ae0a553a.tar.xz | |
Merge branch 'next' into v3.1-rc4
Fixed trivial conflicts in drivers/dma/amba-pl08x.c
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/include/asm/hardware/pl080.h | 4 |
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 e4a04e4..33c78d7 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 */ |