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

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

diff --git a/arch/arm/mach-s3c64xx/Kconfig b/arch/arm/mach-s3c64xx/Kconfig
index 8c2c89c..959df38 100644 (file)
--- a/arch/arm/mach-s3c64xx/Kconfig
+++ b/arch/arm/mach-s3c64xx/Kconfig
@@ -3,6 +3,15 @@
 #
 # Licensed under GPLv2
 
+# temporary until we can eliminate all drivers using it.
+config PLAT_S3C64XX
+       bool
+       depends on ARCH_S3C64XX
+       default y
+       help
+         Base platform code for any Samsung S3C64XX device
+
+
 # Configuration options for the S3C6410 CPU
 
 config CPU_S3C6400
@@ -135,6 +144,21 @@ config SMDK6410_WM1190_EV1
          detected at runtime so the the resulting kernel can be used
          with or without the 1190-EV1 fitted.
 
+config SMDK6410_WM1192_EV1
+       bool "Support Wolfson Microelectronics 1192-EV1 PMIC card"
+       depends on MACH_SMDK6410
+       select REGULATOR
+       select REGULATOR_WM831X
+       select S3C24XX_GPIO_EXTRA64
+       select MFD_WM831X
+       help
+         The Wolfson Microelectronics 1192-EV1 is a WM831x based PMIC
+         daughtercard for the Samsung SMDK6410 reference platform.
+         Enabling this option will build support for this module into
+         the kernel.  The presence of the daughtercard will be
+         detected at runtime so the the resulting kernel can be used
+         with or without the 1192-EV1 fitted.
+
 config MACH_NCP
        bool "NCP"
        select CPU_S3C6410