From 74670a6cfc386fd97a6c73bc23ad1050c04d6bd4 Mon Sep 17 00:00:00 2001 From: Ben Dooks Date: Wed, 23 Dec 2009 18:43:48 +0000 Subject: [PATCH] --- yaml --- r: 187334 b: refs/heads/master c: 2c2f69b15d5420291a941ace10149e76f0af7ab0 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/plat-s3c/Makefile | 3 +-- trunk/arch/arm/plat-samsung/Makefile | 4 ++++ trunk/arch/arm/{plat-s3c => plat-samsung}/clock.c | 0 4 files changed, 6 insertions(+), 3 deletions(-) rename trunk/arch/arm/{plat-s3c => plat-samsung}/clock.c (100%) diff --git a/[refs] b/[refs] index 7353be5e5123..e8c0e49ff561 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 682e2b7d45878586ce84f6993da0b8a2981a399d +refs/heads/master: 2c2f69b15d5420291a941ace10149e76f0af7ab0 diff --git a/trunk/arch/arm/plat-s3c/Makefile b/trunk/arch/arm/plat-s3c/Makefile index 50444da98425..99f91ad1d555 100644 --- a/trunk/arch/arm/plat-s3c/Makefile +++ b/trunk/arch/arm/plat-s3c/Makefile @@ -11,9 +11,8 @@ obj- := # Core support for all Samsung SoCs -obj-y += init.o +obj-y += init.o obj-y += time.o -obj-y += clock.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 ce736ce468fd..7612198bfa59 100644 --- a/trunk/arch/arm/plat-samsung/Makefile +++ b/trunk/arch/arm/plat-samsung/Makefile @@ -9,4 +9,8 @@ obj-m := obj-n := dummy.o obj- := +# Objects we always build independent of SoC choice + +obj-y += clock.o + obj-$(CONFIG_SAMSUNG_CLKSRC) += clock-clksrc.o diff --git a/trunk/arch/arm/plat-s3c/clock.c b/trunk/arch/arm/plat-samsung/clock.c similarity index 100% rename from trunk/arch/arm/plat-s3c/clock.c rename to trunk/arch/arm/plat-samsung/clock.c