]> git.karo-electronics.de Git - karo-tx-linux.git/blobdiff - arch/arm/mach-s3c64xx/Kconfig
Merge branch 'for-linus' of git://www.jni.nu/cris
[karo-tx-linux.git] / arch / arm / mach-s3c64xx / Kconfig
index 11d2353bc506ff5fb548c9c7b4f8b5adafa349a2..f5a59727949fa33e96bceb3a376eb12fe637d42e 100644 (file)
@@ -7,6 +7,7 @@
 config PLAT_S3C64XX
        bool
        depends on ARCH_S3C64XX
+       select SAMSUNG_WAKEMASK
        default y
        help
          Base platform code for any Samsung S3C64XX device
@@ -35,6 +36,11 @@ config S3C64XX_SETUP_SDHCI
          Internal configuration for default SDHCI setup for S3C6400 and
          S3C6410 SoCs.
 
+config S3C64XX_DEV_ONENAND1
+       bool
+       help
+         Compile in platform device definition for OneNAND1 controller
+
 # platform specific device setup
 
 config S3C64XX_SETUP_I2C0
@@ -93,6 +99,8 @@ config MACH_SMDK6410
        select SAMSUNG_DEV_TS
        select S3C_DEV_USB_HOST
        select S3C_DEV_USB_HSOTG
+       select S3C_DEV_WDT
+       select HAVE_S3C2410_WATCHDOG
        select S3C64XX_SETUP_SDHCI
        select S3C64XX_SETUP_I2C1
        select S3C64XX_SETUP_FB_24BPP