Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm

[net-next-2.6.git] / arch / arm / mach-s3c64xx / Kconfig

diff --git a/arch/arm/mach-s3c64xx/Kconfig b/arch/arm/mach-s3c64xx/Kconfig
index 3bbd2045da551b89b5aa2e33ca2ade60a6bb09ef..1ca7bdc6485c44aaffd773a97f524f3a8131c972 100644 (file)
--- a/arch/arm/mach-s3c64xx/Kconfig
+++ b/arch/arm/mach-s3c64xx/Kconfig
@@ -106,6 +106,10 @@ config MACH_MINI6410
        select S3C64XX_SETUP_SDHCI
        select S3C_DEV_USB_HOST
        select S3C_DEV_NAND
+       select S3C_DEV_FB
+       select S3C64XX_SETUP_FB_24BPP
+       select SAMSUNG_DEV_ADC
+       select SAMSUNG_DEV_TS
        help
          Machine support for the FriendlyARM MINI6410
 
@@ -202,6 +206,7 @@ config SMDK6410_WM1192_EV1
        select REGULATOR_WM831X
        select S3C24XX_GPIO_EXTRA64
        select MFD_WM831X
+       select MFD_WM831X_I2C
        help
          The Wolfson Microelectronics 1192-EV1 is a WM831x based PMIC
          daughtercard for the Samsung SMDK6410 reference platform.