aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/plat-s3c/Makefile1
-rw-r--r--arch/arm/plat-samsung/Makefile4
-rw-r--r--arch/arm/plat-samsung/pm-gpio.c (renamed from arch/arm/plat-s3c/pm-gpio.c)0
3 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/plat-s3c/Makefile b/arch/arm/plat-s3c/Makefile
index ea4a001f6793..ac12ba526f77 100644
--- a/arch/arm/plat-s3c/Makefile
+++ b/arch/arm/plat-s3c/Makefile
@@ -22,7 +22,6 @@ obj-$(CONFIG_S3C_DMA) += dma.o
22# PM support 22# PM support
23 23
24obj-$(CONFIG_PM) += pm.o 24obj-$(CONFIG_PM) += pm.o
25obj-$(CONFIG_PM) += pm-gpio.o
26obj-$(CONFIG_S3C2410_PM_CHECK) += pm-check.o 25obj-$(CONFIG_S3C2410_PM_CHECK) += pm-check.o
27 26
28# PWM support 27# PWM support
diff --git a/arch/arm/plat-samsung/Makefile b/arch/arm/plat-samsung/Makefile
index 1fc8d471c6ee..94fe6ea362be 100644
--- a/arch/arm/plat-samsung/Makefile
+++ b/arch/arm/plat-samsung/Makefile
@@ -37,3 +37,7 @@ obj-y += dev-uart.o
37obj-$(CONFIG_S3C_DEV_USB_HOST) += dev-usb.o 37obj-$(CONFIG_S3C_DEV_USB_HOST) += dev-usb.o
38obj-$(CONFIG_S3C_DEV_USB_HSOTG) += dev-usb-hsotg.o 38obj-$(CONFIG_S3C_DEV_USB_HSOTG) += dev-usb-hsotg.o
39obj-$(CONFIG_S3C_DEV_NAND) += dev-nand.o 39obj-$(CONFIG_S3C_DEV_NAND) += dev-nand.o
40
41# PM support
42
43obj-$(CONFIG_PM) += pm-gpio.o
diff --git a/arch/arm/plat-s3c/pm-gpio.c b/arch/arm/plat-samsung/pm-gpio.c
index cfd326a8b693..cfd326a8b693 100644
--- a/arch/arm/plat-s3c/pm-gpio.c
+++ b/arch/arm/plat-samsung/pm-gpio.c