Merge branch 'topic/sirf' into for-linus

diff --git a/drivers/dma/sirf-dma.c b/drivers/dma/sirf-dma.c
index 8ea51c745953a37963e3a0151cfbf02b92b26989..906877919cf383adc73cf23c8f7d20580a737439 100644 (file)
--- 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,
 };