Merge branch 'fix/hda' into for-linus

[~andy/linux] / arch / xtensa / Kconfig

diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig
index 0b7cd52d8b2a5c98c49bcaa092afe030db939764..fa6dc4dd3b193597aea23f0516014f5d1f5005db 100644 (file)
--- a/arch/xtensa/Kconfig
+++ b/arch/xtensa/Kconfig
@@ -48,6 +48,9 @@ config HZ
        int
        default 100
 
+config GENERIC_TIME
+       def_bool y
+
 source "init/Kconfig"
 source "kernel/Kconfig.freezer"
 
@@ -156,6 +159,10 @@ config XTENSA_PLATFORM_XT2000
          XT2000 is the name of Tensilica's feature-rich emulation platform.
          This hardware is capable of running a full Linux distribution.
 
+config XTENSA_PLATFORM_S6105
+       bool "S6105"
+       select SERIAL_CONSOLE
+
 endchoice