summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2010-01-29 09:02:14 +0000
committerBen Dooks <ben-linux@fluff.org>2010-02-23 00:03:43 +0000
commit806c17b5497f62faa65a1fdd235b7fa2df17d704 (patch)
tree6e0fcdeddc1709db7ca89266a3b95e44ab56c281
parent7086a9df056602c8e0d9ae8fe17b028832d05f3d (diff)
downloadblackbird-op-linux-806c17b5497f62faa65a1fdd235b7fa2df17d704.tar.gz
blackbird-op-linux-806c17b5497f62faa65a1fdd235b7fa2df17d704.zip
ARM: SAMSUNG: Move pm.c to plat-samsung
Move pm.c to plat-samsung, it should be usable by all Samsung systems Signed-off-by: Ben Dooks <ben-linux@fluff.org>
-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 89dbdb0adebf..197b9bd139ac 100644
--- a/arch/arm/plat-s3c/Makefile
+++ b/arch/arm/plat-s3c/Makefile
@@ -17,7 +17,3 @@ obj-y += time.o
# DMA support
obj-$(CONFIG_S3C_DMA) += dma.o
-
-# PM support
-
-obj-$(CONFIG_PM) += pm.o
diff --git a/arch/arm/plat-samsung/Makefile b/arch/arm/plat-samsung/Makefile
index c8c8caec8cde..629fd9f92a24 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
# PM support
+obj-$(CONFIG_PM) += pm.o
obj-$(CONFIG_PM) += pm-gpio.o
obj-$(CONFIG_SAMSUNG_PM_CHECK) += pm-check.o
diff --git a/arch/arm/plat-s3c/pm.c b/arch/arm/plat-samsung/pm.c
index 27cfca597699..27cfca597699 100644
--- a/arch/arm/plat-s3c/pm.c
+++ b/arch/arm/plat-samsung/pm.c
OpenPOWER on IntegriCloud