diff --git a/[refs] b/[refs] index a7dbc68ee267..9e37fc272c2e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2c420fe22f3d526691773288807d010068ce3033 +refs/heads/master: 6c6971dc4e8c23bb61bf309898e1693f9c5c8c24 diff --git a/trunk/arch/arm/plat-s3c/Makefile b/trunk/arch/arm/plat-s3c/Makefile index 2a3c4a49117a..867c9cf755a7 100644 --- a/trunk/arch/arm/plat-s3c/Makefile +++ b/trunk/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/trunk/arch/arm/plat-samsung/Makefile b/trunk/arch/arm/plat-samsung/Makefile index facc7e387fc5..22c89d08f6e5 100644 --- a/trunk/arch/arm/plat-samsung/Makefile +++ b/trunk/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/trunk/arch/arm/plat-samsung/dma.c b/trunk/arch/arm/plat-samsung/dma.c index 606db1af5fe7..cb459dd95459 100644 --- a/trunk/arch/arm/plat-samsung/dma.c +++ b/trunk/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/trunk/arch/arm/plat-s3c/init.c b/trunk/arch/arm/plat-samsung/init.c similarity index 100% rename from trunk/arch/arm/plat-s3c/init.c rename to trunk/arch/arm/plat-samsung/init.c diff --git a/trunk/arch/arm/plat-s3c/time.c b/trunk/arch/arm/plat-samsung/time.c similarity index 99% rename from trunk/arch/arm/plat-s3c/time.c rename to trunk/arch/arm/plat-samsung/time.c index 3b27b29da478..2231d80ad817 100644 --- a/trunk/arch/arm/plat-s3c/time.c +++ b/trunk/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,