Merge tag 'cris-for-linus-3.7' of git://jni.nu/cris

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

diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig
index e92215428a37e315d0b5df9f962df8e4c8090dcc..72bd5ae50a890fd1fda0afe419553cf631bd2f2e 100644 (file)
--- a/arch/cris/Kconfig
+++ b/arch/cris/Kconfig
@@ -138,11 +138,6 @@ config CRIS_MACH_ARTPEC3
 
 endchoice
 
-config ETRAX_VCS_SIM
-       bool "VCS Simulator"
-       help
-         Setup hardware to be run in the VCS simulator.
-
 config ETRAX_ARCH_V10
        bool
        default y if ETRAX100LX || ETRAX100LX_V2