Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[pandora-kernel.git] / arch / arm / mach-s5pv210 / Kconfig

diff --git a/arch/arm/mach-s5pv210/Kconfig b/arch/arm/mach-s5pv210/Kconfig
index d59abec..0761eac 100644 (file)
--- a/arch/arm/mach-s5pv210/Kconfig
+++ b/arch/arm/mach-s5pv210/Kconfig
@@ -13,18 +13,10 @@ config CPU_S5PV210
        bool
        select PLAT_S5P
        select S3C_PL330_DMA
+       select S5P_EXT_INT
        help
          Enable S5PV210 CPU support
 
-config MACH_AQUILA
-       bool "Samsung Aquila"
-       select CPU_S5PV210
-       select ARCH_SPARSEMEM_ENABLE
-       select S5PV210_SETUP_FB_24BPP
-       select S3C_DEV_FB
-       help
-         Machine support for the Samsung Aquila target based on S5PC110 SoC
-
 config S5PV210_SETUP_I2C1
        bool
        help
@@ -51,6 +43,17 @@ config S5PV210_SETUP_SDHCI_GPIO
        help
          Common setup code for SDHCI gpio.
 
+# machine support
+
+config MACH_AQUILA
+       bool "Samsung Aquila"
+       select CPU_S5PV210
+       select ARCH_SPARSEMEM_ENABLE
+       select S5PV210_SETUP_FB_24BPP
+       select S3C_DEV_FB
+       help
+         Machine support for the Samsung Aquila target based on S5PC110 SoC
+
 config MACH_GONI
        bool "GONI"
        select CPU_S5PV210
@@ -59,10 +62,19 @@ config MACH_GONI
          Machine support for Samsung GONI board
          S5PC110(MCP) is one of package option of S5PV210
 
+config S5PC110_DEV_ONENAND
+       bool
+       help
+         Compile in platform device definition for OneNAND1 controller
+
 config MACH_SMDKV210
        bool "SMDKV210"
        select CPU_S5PV210
        select ARCH_SPARSEMEM_ENABLE
+       select SAMSUNG_DEV_ADC
+       select SAMSUNG_DEV_TS
+       select S3C_DEV_WDT
+       select HAVE_S3C2410_WATCHDOG
        help
          Machine support for Samsung SMDKV210
 
@@ -70,6 +82,8 @@ config MACH_SMDKC110
        bool "SMDKC110"
        select CPU_S5PV210
        select ARCH_SPARSEMEM_ENABLE
+       select S3C_DEV_WDT
+       select HAVE_S3C2410_WATCHDOG
        help
          Machine support for Samsung SMDKC110
          S5PC110(MCP) is one of package option of S5PV210