summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s5pv210/pm.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-02-28 12:33:41 +0000
committerArnd Bergmann <arnd@arndb.de>2012-02-28 12:33:46 +0000
commitabf45ce84c4e36bd64aef20d7df9a79bd5e4b799 (patch)
treef118e135bdd60b680703d1b38c7fdc7b9d7c503d /arch/arm/mach-s5pv210/pm.c
parent082f53c2f573c75a8f1610c587a43b6817e20f90 (diff)
parentb1f91a9ce335eb4e0fef17c10f39a438ac3fce9b (diff)
downloadblackbird-obmc-linux-abf45ce84c4e36bd64aef20d7df9a79bd5e4b799.tar.gz
blackbird-obmc-linux-abf45ce84c4e36bd64aef20d7df9a79bd5e4b799.zip
Merge branch 'imx/defconfig' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/soc
* 'imx/defconfig' of git://git.linaro.org/people/shawnguo/linux-2.6: (2 commits) ARM: defconfig: imx_v6_v7: build in REGULATOR_FIXED_VOLTAGE ARM: imx: update imx_v6_v7_defconfig (upadte to v3.3-rc5)
Diffstat (limited to 'arch/arm/mach-s5pv210/pm.c')
-rw-r--r--arch/arm/mach-s5pv210/pm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s5pv210/pm.c b/arch/arm/mach-s5pv210/pm.c
index 677c71c41e50..736bfb103cbc 100644
--- a/arch/arm/mach-s5pv210/pm.c
+++ b/arch/arm/mach-s5pv210/pm.c
@@ -133,7 +133,7 @@ static void s5pv210_pm_prepare(void)
s3c_pm_do_save(s5pv210_core_save, ARRAY_SIZE(s5pv210_core_save));
}
-static int s5pv210_pm_add(struct device *dev)
+static int s5pv210_pm_add(struct device *dev, struct subsys_interface *sif)
{
pm_cpu_prep = s5pv210_pm_prepare;
pm_cpu_sleep = s5pv210_cpu_suspend;
OpenPOWER on IntegriCloud