diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org>
| 2012-10-03 07:36:36 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org>
| 2012-10-03 07:36:36 -0700 |
| commit | b463036ad7c6e9a74275f4f901acb3dbb74ec1ad (patch) | |
| tree | bfb3f6bb5c93f32728e5cfd052041f0619055f71 /arch/cris/Kconfig | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc (diff) | |
| parent | CRIS: Remove VCS simulator specific code (diff) | |
| download | linux-b463036ad7c6e9a74275f4f901acb3dbb74ec1ad.tar.gz linux-b463036ad7c6e9a74275f4f901acb3dbb74ec1ad.tar.bz2 linux-b463036ad7c6e9a74275f4f901acb3dbb74ec1ad.zip | |
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/Kconfig | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig index e92215428a37..72bd5ae50a89 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 |