Merge branch 'next-merged' of git://aeryn.fluff.org.uk/bjdooks/linux into devel

1 files changed, 13 insertions, 0 deletions

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index d953ed95701e..f1a3b10cfa9e 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -518,6 +518,13 @@ config ARCH_S3C2410
           BAST (<http://www.simtec.co.uk/products/EB110ITX/>), the IPAQ 1940 or
           the Samsung SMDK2410 development board (and derivatives).
 
+config ARCH_S3C64XX
+        bool "Samsung S3C64XX"
+        select GENERIC_GPIO
+        select HAVE_CLK
+        help
+          Samsung S3C64XX series based systems
+
 config ARCH_SHARK
         bool "Shark"
         select CPU_SA110
@@ -621,6 +628,7 @@ source "arch/arm/mach-orion5x/Kconfig"
 source "arch/arm/mach-kirkwood/Kconfig"
 
 source "arch/arm/plat-s3c24xx/Kconfig"
+source "arch/arm/plat-s3c64xx/Kconfig"
 source "arch/arm/plat-s3c/Kconfig"
 
 if ARCH_S3C2410
@@ -632,6 +640,11 @@ source "arch/arm/mach-s3c2442/Kconfig"
 source "arch/arm/mach-s3c2443/Kconfig"
 endif
 
+if ARCH_S3C64XX
+source "arch/arm/mach-s3c6400/Kconfig"
+source "arch/arm/mach-s3c6410/Kconfig"
+endif
+
 source "arch/arm/mach-lh7a40x/Kconfig"
 
 source "arch/arm/mach-imx/Kconfig"