summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorWenyou Yang <wenyou.yang@atmel.com>2015-03-09 11:50:29 +0800
committerNicolas Ferre <nicolas.ferre@atmel.com>2015-03-13 13:34:54 +0100
commit828b98fa380662406f9a84e09372b18e45babbf2 (patch)
tree6f81319feddfaccd7df520e1c6e6190b374a1a17 /arch
parent23be4be5a666c6b4e6fe8ddbbb84fb4f2efee0a5 (diff)
downloadlinux-stable-828b98fa380662406f9a84e09372b18e45babbf2.tar.gz
linux-stable-828b98fa380662406f9a84e09372b18e45babbf2.tar.bz2
linux-stable-828b98fa380662406f9a84e09372b18e45babbf2.zip
ARM: at91/pm: rename file name: pm_slowclock.S --> pm_suspend.S
Because the sram function is used for both suspend to memory and the suspend to standby mode, renaming is more elegant. Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com> Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Tested-by: Sylvain Rochet <sylvain.rochet@finsecur.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-at91/Makefile2
-rw-r--r--arch/arm/mach-at91/pm_suspend.S (renamed from arch/arm/mach-at91/pm_slowclock.S)0
2 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile
index 103c256ecb8b..7df8c854f80f 100644
--- a/arch/arm/mach-at91/Makefile
+++ b/arch/arm/mach-at91/Makefile
@@ -13,7 +13,7 @@ obj-$(CONFIG_SOC_SAMA5) += sama5.o
# Power Management
obj-$(CONFIG_PM) += pm.o
-obj-$(CONFIG_PM) += pm_slowclock.o
+obj-$(CONFIG_PM) += pm_suspend.o
ifeq ($(CONFIG_PM_DEBUG),y)
CFLAGS_pm.o += -DDEBUG
diff --git a/arch/arm/mach-at91/pm_slowclock.S b/arch/arm/mach-at91/pm_suspend.S
index db35f72e7bad..db35f72e7bad 100644
--- a/arch/arm/mach-at91/pm_slowclock.S
+++ b/arch/arm/mach-at91/pm_suspend.S