ARM: SAMSUNG: Move pm-gpio into plat-samsung
authorBen Dooks <ben-linux@fluff.org>
Mon, 18 Jan 2010 01:47:45 +0000 (10:47 +0900)
committerBen Dooks <ben-linux@fluff.org>
Tue, 19 Jan 2010 09:37:19 +0000 (18:37 +0900)
Move the pm-gpio code into plat-samsung.

Note, this should be changed later to properly compile the 4bit code if
the 4bit settings are enabled.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
arch/arm/plat-s3c/Makefile
arch/arm/plat-samsung/Makefile
arch/arm/plat-samsung/pm-gpio.c [moved from arch/arm/plat-s3c/pm-gpio.c with 100% similarity]

index ea4a001..ac12ba5 100644 (file)
@@ -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
index 1fc8d47..94fe6ea 100644 (file)
@@ -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