From fff14347c54e0c30cf6bac5adb8950f2513e8da0 Mon Sep 17 00:00:00 2001 From: Ben Dooks Date: Mon, 18 Jan 2010 10:47:45 +0900 Subject: [PATCH] --- yaml --- r: 187396 b: refs/heads/master c: 67866fb38680d85cbd13c7bb468fb89f16e026d1 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/plat-s3c/Makefile | 1 - trunk/arch/arm/plat-samsung/Makefile | 4 ++++ trunk/arch/arm/{plat-s3c => plat-samsung}/pm-gpio.c | 0 4 files changed, 5 insertions(+), 2 deletions(-) rename trunk/arch/arm/{plat-s3c => plat-samsung}/pm-gpio.c (100%) diff --git a/[refs] b/[refs] index a3e64498f1b6..b00c8b08a133 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 42d828d46f526605c84ebdb5a987fd25fe09a3c9 +refs/heads/master: 67866fb38680d85cbd13c7bb468fb89f16e026d1 diff --git a/trunk/arch/arm/plat-s3c/Makefile b/trunk/arch/arm/plat-s3c/Makefile index ea4a001f6793..ac12ba526f77 100644 --- a/trunk/arch/arm/plat-s3c/Makefile +++ b/trunk/arch/arm/plat-s3c/Makefile @@ -22,7 +22,6 @@ obj-$(CONFIG_S3C_DMA) += dma.o # PM support obj-$(CONFIG_PM) += pm.o -obj-$(CONFIG_PM) += pm-gpio.o obj-$(CONFIG_S3C2410_PM_CHECK) += pm-check.o # PWM support diff --git a/trunk/arch/arm/plat-samsung/Makefile b/trunk/arch/arm/plat-samsung/Makefile index 1fc8d471c6ee..94fe6ea362be 100644 --- a/trunk/arch/arm/plat-samsung/Makefile +++ b/trunk/arch/arm/plat-samsung/Makefile @@ -37,3 +37,7 @@ obj-y += dev-uart.o obj-$(CONFIG_S3C_DEV_USB_HOST) += dev-usb.o obj-$(CONFIG_S3C_DEV_USB_HSOTG) += dev-usb-hsotg.o obj-$(CONFIG_S3C_DEV_NAND) += dev-nand.o + +# PM support + +obj-$(CONFIG_PM) += pm-gpio.o diff --git a/trunk/arch/arm/plat-s3c/pm-gpio.c b/trunk/arch/arm/plat-samsung/pm-gpio.c similarity index 100% rename from trunk/arch/arm/plat-s3c/pm-gpio.c rename to trunk/arch/arm/plat-samsung/pm-gpio.c