aboutsummaryrefslogtreecommitdiff
path: root/arch/cris/Kconfig
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-10-03 07:36:36 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-10-03 07:36:36 -0700
commitb463036ad7c6e9a74275f4f901acb3dbb74ec1ad (patch)
treebfb3f6bb5c93f32728e5cfd052041f0619055f71 /arch/cris/Kconfig
parenta06cb1ae3cb64367c0fdc313c43ebb0558e51827 (diff)
parentd75d806cbbfb9c775e87779cd281c9c408c7aba3 (diff)
downloadlinux-b463036ad7c6e9a74275f4f901acb3dbb74ec1ad.tar.gz
Merge tag 'cris-for-linus-3.7' of git://jni.nu/cris
Pull CRIS changes from Jesper Nilsson: "Removal of some unused code from the CRIS port" * tag 'cris-for-linus-3.7' of git://jni.nu/cris: CRIS: Remove VCS simulator specific code cris/PCI: remove pcibios_assign_resources()
Diffstat (limited to 'arch/cris/Kconfig')
-rw-r--r--arch/cris/Kconfig5
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig
index e92215428a3..72bd5ae50a8 100644
--- 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