diff options
author | Arnd Bergmann <arnd@arndb.de> | 2015-01-13 14:23:13 +0100 |
---|---|---|
committer | Vinod Koul <vinod.koul@intel.com> | 2015-01-13 21:20:09 +0530 |
commit | 10b3e223174f28eabadab18b5dfa36021d956a2d (patch) | |
tree | 568f02d744c7ba516e29b93029c5a4494c4cd8ae /drivers/mcb/Makefile | |
parent | a1a9becbf35899cd44ac1bea4a04f98e5adc9ffb (diff) |
dmaengine: k3: fix duplicate function definition
Commit db08425ebd51f ("dmaengine: k3: Split device_control") introduced
two new helper functions, which unfortunately have the same names
as the existing suspend/resume functions, resulting in a build error
when CONFIG_PM_SLEEP is enabled:
drivers/dma/k3dma.c:823:12: error: conflicting types for 'k3_dma_resume'
static int k3_dma_resume(struct device *dev)
^
drivers/dma/k3dma.c:625:12: note: previous definition of 'k3_dma_resume' was here
static int k3_dma_resume(struct dma_chan *chan)
^
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: db08425ebd51f ("dmaengine: k3: Split device_control")
Reported-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'drivers/mcb/Makefile')
0 files changed, 0 insertions, 0 deletions