From 44469860e0cba143c740a6676e4e79771f5a0f04 Mon Sep 17 00:00:00 2001 From: Ben Dooks Date: Wed, 6 Jan 2010 02:39:28 +0900 Subject: [PATCH] --- yaml --- r: 187339 b: refs/heads/master c: 9745626b65b856bf58e70feb4eee1e5471db699e h: refs/heads/master i: 187337: 2c28c881592be990c0d5ef428767bf4c11871b64 187335: 33220a7bcf9bdfcc72df88e53f4cc6497bc6b8d3 v: v3 --- [refs] | 2 +- trunk/arch/arm/plat-s3c/Makefile | 1 - trunk/arch/arm/plat-samsung/Makefile | 1 + trunk/arch/arm/{plat-s3c => plat-samsung}/pwm-clock.c | 0 4 files changed, 2 insertions(+), 2 deletions(-) rename trunk/arch/arm/{plat-s3c => plat-samsung}/pwm-clock.c (100%) diff --git a/[refs] b/[refs] index 2177fbd18cfc..3e281338d76f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ed276849bc6a8ad5bb0f9fa94fe8305ee67bb6c6 +refs/heads/master: 9745626b65b856bf58e70feb4eee1e5471db699e diff --git a/trunk/arch/arm/plat-s3c/Makefile b/trunk/arch/arm/plat-s3c/Makefile index 99f91ad1d555..ef10a9131bba 100644 --- a/trunk/arch/arm/plat-s3c/Makefile +++ b/trunk/arch/arm/plat-s3c/Makefile @@ -13,7 +13,6 @@ obj- := obj-y += init.o obj-y += time.o -obj-y += pwm-clock.o obj-y += gpio.o obj-y += gpio-config.o diff --git a/trunk/arch/arm/plat-samsung/Makefile b/trunk/arch/arm/plat-samsung/Makefile index 7612198bfa59..d4d5f942d34c 100644 --- a/trunk/arch/arm/plat-samsung/Makefile +++ b/trunk/arch/arm/plat-samsung/Makefile @@ -12,5 +12,6 @@ obj- := # Objects we always build independent of SoC choice obj-y += clock.o +obj-y += pwm-clock.o obj-$(CONFIG_SAMSUNG_CLKSRC) += clock-clksrc.o diff --git a/trunk/arch/arm/plat-s3c/pwm-clock.c b/trunk/arch/arm/plat-samsung/pwm-clock.c similarity index 100% rename from trunk/arch/arm/plat-s3c/pwm-clock.c rename to trunk/arch/arm/plat-samsung/pwm-clock.c