diff --git a/[refs] b/[refs] index 5f3a45137978..e5429d9b7b0b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8e2e27c7444ba7880aa0a4cb07a79de130d0ed93 +refs/heads/master: 5a67ac572e102f7d877b8a3a18a59315186e3e99 diff --git a/trunk/drivers/dma/pl330.c b/trunk/drivers/dma/pl330.c index 6d550421da7a..3ce7d553a746 100644 --- a/trunk/drivers/dma/pl330.c +++ b/trunk/drivers/dma/pl330.c @@ -2539,7 +2539,7 @@ static inline void _init_desc(struct dma_pl330_desc *desc) } /* Returns the number of descriptors added to the DMAC pool */ -int add_desc(struct dma_pl330_dmac *pdmac, gfp_t flg, int count) +static int add_desc(struct dma_pl330_dmac *pdmac, gfp_t flg, int count) { struct dma_pl330_desc *desc; unsigned long flags;