From 6c6971dc4e8c23bb61bf309898e1693f9c5c8c24 Mon Sep 17 00:00:00 2001 From: Ben Dooks Date: Fri, 29 Jan 2010 09:02:16 +0000 Subject: [PATCH] ARM: SAMSUNG: Move the last build from plat-s3c to plat-samsung Move the init.c and time.c files to plat-samsung from plat-s3c, thus clearing the last files that are being built in here. Signed-off-by: Ben Dooks --- arch/arm/plat-s3c/Makefile | 4 +--- arch/arm/plat-samsung/Makefile | 2 ++ arch/arm/plat-samsung/dma.c | 2 +- arch/arm/{plat-s3c => plat-samsung}/init.c | 0 arch/arm/{plat-s3c => plat-samsung}/time.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) rename arch/arm/{plat-s3c => plat-samsung}/init.c (100%) rename arch/arm/{plat-s3c => plat-samsung}/time.c (99%) diff --git a/arch/arm/plat-s3c/Makefile b/arch/arm/plat-s3c/Makefile index 2a3c4a49117a..867c9cf755a7 100644 --- a/arch/arm/plat-s3c/Makefile +++ b/arch/arm/plat-s3c/Makefile @@ -6,10 +6,8 @@ obj-y := obj-m := -obj-n := +obj-n := dummy.o obj- := # Core support for all Samsung SoCs -obj-y += init.o -obj-y += time.o diff --git a/arch/arm/plat-samsung/Makefile b/arch/arm/plat-samsung/Makefile index facc7e387fc5..22c89d08f6e5 100644 --- a/arch/arm/plat-samsung/Makefile +++ b/arch/arm/plat-samsung/Makefile @@ -11,6 +11,8 @@ obj- := # Objects we always build independent of SoC choice +obj-y += init.o +obj-y += time.o obj-y += clock.o obj-y += pwm-clock.o obj-y += gpio.o diff --git a/arch/arm/plat-samsung/dma.c b/arch/arm/plat-samsung/dma.c index 606db1af5fe7..cb459dd95459 100644 --- a/arch/arm/plat-samsung/dma.c +++ b/arch/arm/plat-samsung/dma.c @@ -1,4 +1,4 @@ -/* linux/arch/arm/plat-s3c/dma.c +/* linux/arch/arm/plat-samsung/dma.c * * Copyright (c) 2003-2009 Simtec Electronics * Ben Dooks diff --git a/arch/arm/plat-s3c/init.c b/arch/arm/plat-samsung/init.c similarity index 100% rename from arch/arm/plat-s3c/init.c rename to arch/arm/plat-samsung/init.c diff --git a/arch/arm/plat-s3c/time.c b/arch/arm/plat-samsung/time.c similarity index 99% rename from arch/arm/plat-s3c/time.c rename to arch/arm/plat-samsung/time.c index 3b27b29da478..2231d80ad817 100644 --- a/arch/arm/plat-s3c/time.c +++ b/arch/arm/plat-samsung/time.c @@ -1,4 +1,4 @@ -/* linux/arch/arm/plat-s3c24xx/time.c +/* linux/arch/arm/plat-samsung/time.c * * Copyright (C) 2003-2005 Simtec Electronics * Ben Dooks, -- 2.34.1