diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-03 10:36:36 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-03 10:36:36 -0400 |
| commit | b463036ad7c6e9a74275f4f901acb3dbb74ec1ad (patch) | |
| tree | bfb3f6bb5c93f32728e5cfd052041f0619055f71 /arch/cris/Kconfig | |
| parent | a06cb1ae3cb64367c0fdc313c43ebb0558e51827 (diff) | |
| parent | d75d806cbbfb9c775e87779cd281c9c408c7aba3 (diff) | |
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 | |||
| 138 | 138 | ||
| 139 | endchoice | 139 | endchoice |
| 140 | 140 | ||
| 141 | config ETRAX_VCS_SIM | ||
| 142 | bool "VCS Simulator" | ||
| 143 | help | ||
| 144 | Setup hardware to be run in the VCS simulator. | ||
| 145 | |||
| 146 | config ETRAX_ARCH_V10 | 141 | config ETRAX_ARCH_V10 |
| 147 | bool | 142 | bool |
| 148 | default y if ETRAX100LX || ETRAX100LX_V2 | 143 | default y if ETRAX100LX || ETRAX100LX_V2 |