diff options
| author | Ben Dooks <ben.dooks@codethink.co.uk> | 2016-06-09 13:57:12 +0200 |
|---|---|---|
| committer | Gregory CLEMENT <gregory.clement@free-electrons.com> | 2016-06-16 12:01:37 +0200 |
| commit | d705c1a66e151e587271265c29844817d5108375 (patch) | |
| tree | 4ae2c8db822ce83d6a3511183c9fe9a9270cc50d /arch/arm/mach-mvebu | |
| parent | ARM: Kirkwood: make kirkwood_disable_mbus_error_propagation() static (diff) | |
| download | linux-d705c1a66e151e587271265c29844817d5108375.tar.xz linux-d705c1a66e151e587271265c29844817d5108375.zip | |
ARM: Kirkwood: fix kirkwood_pm_init() declaration/type
The kirkwood-pm.c was missing the include of kirkwood-pm.h to
define the kirkwood_pm_init() function. However once this is
included, the types do not match.
Fixup the include, and then the prototype to avoid the following
warning:
arch/arm/mach-mvebu/kirkwood-pm.c:69:12: warning: symbol 'kirkwood_pm_init' was not declared. Should it be static?
Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Diffstat (limited to 'arch/arm/mach-mvebu')
| -rw-r--r-- | arch/arm/mach-mvebu/kirkwood-pm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-mvebu/kirkwood-pm.c b/arch/arm/mach-mvebu/kirkwood-pm.c index cbb816f2120c..1e1f879f16ce 100644 --- a/arch/arm/mach-mvebu/kirkwood-pm.c +++ b/arch/arm/mach-mvebu/kirkwood-pm.c @@ -18,6 +18,7 @@ #include <linux/suspend.h> #include <linux/io.h> #include "kirkwood.h" +#include "kirkwood-pm.h" static void __iomem *ddr_operation_base; static void __iomem *memory_pm_ctrl; @@ -66,11 +67,10 @@ static const struct platform_suspend_ops kirkwood_suspend_ops = { .valid = kirkwood_pm_valid_standby, }; -int __init kirkwood_pm_init(void) +void __init kirkwood_pm_init(void) { ddr_operation_base = ioremap(DDR_OPERATION_BASE, 4); memory_pm_ctrl = ioremap(MEMORY_PM_CTRL_PHYS, 4); suspend_set_ops(&kirkwood_suspend_ops); - return 0; } |