aboutsummaryrefslogtreecommitdiffstats
path: root/arch/xtensa
diff options
context:
space:
mode:
authorChris Zankel <chris@zankel.net>2009-04-16 03:25:39 -0400
committerChris Zankel <chris@zankel.net>2009-05-12 00:48:17 -0400
commit35e71f90687fd904b43e3427673827ac3e77b4d1 (patch)
treea87913c620e6746d2070b4e963953f54af120874 /arch/xtensa
parent1d80cac0fe44fb87b2a3d35fddd7f534ea81cd90 (diff)
xtensa: Fix architecture specific Kconfig
Move a misplace endmenu marker to enable platform options and disable PCI and automatic calibrating for the XT2K board. The on-board PCI bridge is somewhat broken, anyway, and the calibrating relies on some whacky usage of the serial port. Signed-off-by: Chris Zankel <chris@zankel.net>
Diffstat (limited to 'arch/xtensa')
-rw-r--r--arch/xtensa/Kconfig6
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig
index fa6dc4dd3b19..30d21a9e2ef5 100644
--- a/arch/xtensa/Kconfig
+++ b/arch/xtensa/Kconfig
@@ -137,6 +137,8 @@ config PCI
137 137
138source "drivers/pci/Kconfig" 138source "drivers/pci/Kconfig"
139 139
140endmenu
141
140menu "Platform options" 142menu "Platform options"
141 143
142choice 144choice
@@ -153,8 +155,6 @@ config XTENSA_PLATFORM_ISS
153 155
154config XTENSA_PLATFORM_XT2000 156config XTENSA_PLATFORM_XT2000
155 bool "XT2000" 157 bool "XT2000"
156 select XTENSA_CALIBRATE_CCOUNT
157 select PCI
158 help 158 help
159 XT2000 is the name of Tensilica's feature-rich emulation platform. 159 XT2000 is the name of Tensilica's feature-rich emulation platform.
160 This hardware is capable of running a full Linux distribution. 160 This hardware is capable of running a full Linux distribution.
@@ -192,8 +192,6 @@ config CMDLINE
192 192
193source "mm/Kconfig" 193source "mm/Kconfig"
194 194
195endmenu
196
197config HOTPLUG 195config HOTPLUG
198 bool "Support for hot-pluggable devices" 196 bool "Support for hot-pluggable devices"
199 help 197 help