]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commit - drivers/dma/k3dma.c
dmaengine: k3: Fix duplicated function name and allmodconfig build
authorKrzysztof Kozlowski <k.kozlowski@samsung.com>
Mon, 29 Dec 2014 13:01:30 +0000 (14:01 +0100)
committerVinod Koul <vinod.koul@intel.com>
Tue, 13 Jan 2015 15:49:44 +0000 (21:19 +0530)
commita1a9becbf35899cd44ac1bea4a04f98e5adc9ffb
treea2d836b595b309c516407d2eb7a9f7e571fc6471
parentfbde286783f7c1e55e6c33575fa1a56f8ea77c90
dmaengine: k3: Fix duplicated function name and allmodconfig build

While splitting device control in db08425ebd51 ("dmaengine: k3:
Split device_control") new function with the same 'k3_dma_resume' name
was added, leading to build error:

drivers/dma/k3dma.c:823:12: error: conflicting types for ‘k3_dma_resume’
drivers/dma/k3dma.c:625:12: note: previous definition of ‘k3_dma_resume’ was here

Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
drivers/dma/k3dma.c