aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/plat-s3c/Makefile4
-rw-r--r--arch/arm/plat-samsung/Makefile1
-rw-r--r--arch/arm/plat-samsung/pm.c (renamed from arch/arm/plat-s3c/pm.c)0
3 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm/plat-s3c/Makefile b/arch/arm/plat-s3c/Makefile
index 89dbdb0adeb..197b9bd139a 100644
--- a/arch/arm/plat-s3c/Makefile
+++ b/arch/arm/plat-s3c/Makefile
@@ -17,7 +17,3 @@ obj-y += time.o
17# DMA support 17# DMA support
18 18
19obj-$(CONFIG_S3C_DMA) += dma.o 19obj-$(CONFIG_S3C_DMA) += dma.o
20
21# PM support
22
23obj-$(CONFIG_PM) += pm.o
diff --git a/arch/arm/plat-samsung/Makefile b/arch/arm/plat-samsung/Makefile
index c8c8caec8cd..629fd9f92a2 100644
--- a/arch/arm/plat-samsung/Makefile
+++ b/arch/arm/plat-samsung/Makefile
@@ -41,6 +41,7 @@ obj-$(CONFIG_S3C_DEV_NAND) += dev-nand.o
41 41
42# PM support 42# PM support
43 43
44obj-$(CONFIG_PM) += pm.o
44obj-$(CONFIG_PM) += pm-gpio.o 45obj-$(CONFIG_PM) += pm-gpio.o
45obj-$(CONFIG_SAMSUNG_PM_CHECK) += pm-check.o 46obj-$(CONFIG_SAMSUNG_PM_CHECK) += pm-check.o
46 47
diff --git a/arch/arm/plat-s3c/pm.c b/arch/arm/plat-samsung/pm.c
index 27cfca59769..27cfca59769 100644
--- a/arch/arm/plat-s3c/pm.c
+++ b/arch/arm/plat-samsung/pm.c