diff options
author | Vinod Koul <vinod.koul@intel.com> | 2016-07-16 17:40:26 +0300 |
---|---|---|
committer | Vinod Koul <vinod.koul@intel.com> | 2016-07-16 17:40:26 +0300 |
commit | ff581417a95011190d509aea38395b9fe817297d (patch) | |
tree | d6347b3388f0f8ce459e3a25fd800224032c450f /drivers/dma | |
parent | 9c4d7e648161414d02a316fa05dfd8f030dfc762 (diff) | |
parent | 7978a583b1d4413f4e58b145081a4a93d94398f7 (diff) | |
download | linux-ff581417a95011190d509aea38395b9fe817297d.tar.xz |
Merge branch 'topic/sirf' into for-linus
Diffstat (limited to 'drivers/dma')
-rw-r--r-- | drivers/dma/sirf-dma.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/dma/sirf-dma.c b/drivers/dma/sirf-dma.c index 8ea51c745953..906877919cf3 100644 --- a/drivers/dma/sirf-dma.c +++ b/drivers/dma/sirf-dma.c @@ -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) }; -struct sirfsoc_dmadata sirfsoc_dmadata_a6 = { +static struct sirfsoc_dmadata sirfsoc_dmadata_a6 = { .exec = sirfsoc_dma_execute_hw_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, .type = SIRFSOC_DMA_VER_A7V1, }; -struct sirfsoc_dmadata sirfsoc_dmadata_a7v2 = { +static struct sirfsoc_dmadata sirfsoc_dmadata_a7v2 = { .exec = sirfsoc_dma_execute_hw_a7v2, .type = SIRFSOC_DMA_VER_A7V2, }; |