iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'topic/sirf' into for-linus

Browse Source
This commit is contained in:
Vinod Koul 2016-07-16 20:10:26 +05:30
commit ff581417a9
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/dma/sirf-dma.c
View File

@ -1125,17 +1125,17 @@ static const struct dev_pm_ops sirfsoc_dma_pm_ops = {
SET_SYSTEM_SLEEP_PM_OPS(sirfsoc_dma_pm_suspend, sirfsoc_dma_pm_resume) SET_SYSTEM_SLEEP_PM_OPS(sirfsoc_dma_pm_suspend, sirfsoc_dma_pm_resume)
}; };
struct sirfsoc_dmadata sirfsoc_dmadata_a6 = { static struct sirfsoc_dmadata sirfsoc_dmadata_a6 = {
.exec = sirfsoc_dma_execute_hw_a6, .exec = sirfsoc_dma_execute_hw_a6,
.type = SIRFSOC_DMA_VER_A6, .type = SIRFSOC_DMA_VER_A6,
}; };
struct sirfsoc_dmadata sirfsoc_dmadata_a7v1 = { static struct sirfsoc_dmadata sirfsoc_dmadata_a7v1 = {
.exec = sirfsoc_dma_execute_hw_a7v1, .exec = sirfsoc_dma_execute_hw_a7v1,
.type = SIRFSOC_DMA_VER_A7V1, .type = SIRFSOC_DMA_VER_A7V1,
}; };
struct sirfsoc_dmadata sirfsoc_dmadata_a7v2 = { static struct sirfsoc_dmadata sirfsoc_dmadata_a7v2 = {
.exec = sirfsoc_dma_execute_hw_a7v2, .exec = sirfsoc_dma_execute_hw_a7v2,
.type = SIRFSOC_DMA_VER_A7V2, .type = SIRFSOC_DMA_VER_A7V2,
}; };