---

yaml --- r: 187676 b: refs/heads/master c: 7965b21 h: refs/heads/master v: v3
git-mirror · Feb 24, 2010 · 604590e · 604590e
1 parent 4abdd17
commit 604590e
Show file tree

Hide file tree

Showing 8 changed files with 5 additions and 94 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f94327f2cebf3711defd25375df0c380562127ba
+refs/heads/master: 7965b214bfbe0e6b3dc843cd1d639dc2711ff86e
diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig
@@ -799,7 +799,6 @@ source "arch/arm/mach-dove/Kconfig"
 
 source "arch/arm/plat-samsung/Kconfig"
 source "arch/arm/plat-s3c24xx/Kconfig"
-source "arch/arm/plat-s3c/Kconfig"
 source "arch/arm/plat-s5p/Kconfig"
 source "arch/arm/plat-s5pc1xx/Kconfig"
 

diff --git a/trunk/arch/arm/Makefile b/trunk/arch/arm/Makefile
@@ -182,10 +182,10 @@ plat-$(CONFIG_PLAT_IOP)		:= iop
 plat-$(CONFIG_PLAT_NOMADIK)	:= nomadik
 plat-$(CONFIG_PLAT_ORION)	:= orion
 plat-$(CONFIG_PLAT_PXA)		:= pxa
-plat-$(CONFIG_PLAT_S3C24XX)	:= s3c24xx s3c samsung
-plat-$(CONFIG_ARCH_S3C64XX)	:= s3c samsung
-plat-$(CONFIG_PLAT_S5PC1XX)	:= s5pc1xx s3c samsung
-plat-$(CONFIG_PLAT_S5P)		:= s5p samsung s3c
+plat-$(CONFIG_PLAT_S3C24XX)	:= s3c24xx samsung
+plat-$(CONFIG_ARCH_S3C64XX)	:= samsung
+plat-$(CONFIG_PLAT_S5PC1XX)	:= s5pc1xx samsung
+plat-$(CONFIG_PLAT_S5P)		:= s5p samsung
 plat-$(CONFIG_ARCH_STMP3XXX)	:= stmp3xxx
 
 ifeq ($(CONFIG_ARCH_EBSA110),y)

diff --git a/trunk/arch/arm/plat-s3c/Kconfig b/trunk/arch/arm/plat-s3c/Kconfig
diff --git a/trunk/arch/arm/plat-s3c/Makefile b/trunk/arch/arm/plat-s3c/Makefile
diff --git a/trunk/arch/arm/plat-s3c/include/mach/io.h b/trunk/arch/arm/plat-s3c/include/mach/io.h
diff --git a/trunk/arch/arm/plat-s3c/include/mach/timex.h b/trunk/arch/arm/plat-s3c/include/mach/timex.h
diff --git a/trunk/arch/arm/plat-s3c/include/mach/vmalloc.h b/trunk/arch/arm/plat-s3c/include/mach/vmalloc.h