diff options
| author | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-06-04 19:45:25 +0800 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-06-04 19:45:25 +0800 |
| commit | aede9c200012ac488f5973ff6edca1392a254914 (patch) | |
| tree | 8f59fcd608f9712d6cffdf967e0ce8fe94aaf06d /arch/arm/plat-nomadik/include/plat/ste_dma40.h | |
| parent | a05c58e73b23211d7b8d4ea31a0519ea41d4ec3c (diff) | |
| parent | 0070efb0e13377b5a7d7d3c05518fafc34f58364 (diff) | |
Merge topic branch 'mach-plat' into integration-linux-ux500
Signed-off-by: Philippe Langlais <philippe.langlais@stericsson.com>
Diffstat (limited to 'arch/arm/plat-nomadik/include/plat/ste_dma40.h')
| -rw-r--r-- | arch/arm/plat-nomadik/include/plat/ste_dma40.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/plat-nomadik/include/plat/ste_dma40.h b/arch/arm/plat-nomadik/include/plat/ste_dma40.h index 9ff93b06568..e67a8cab13c 100644 --- a/arch/arm/plat-nomadik/include/plat/ste_dma40.h +++ b/arch/arm/plat-nomadik/include/plat/ste_dma40.h @@ -146,6 +146,7 @@ struct stedma40_chan_cfg { * @memcpy_conf_phy: default configuration of physical channel memcpy * @memcpy_conf_log: default configuration of logical channel memcpy * @disabled_channels: A vector, ending with -1, that marks physical channels + * @use_esram_lcla: flag for mapping the lcla into esram region * that are for different reasons not available for the driver. */ struct stedma40_platform_data { |