summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorChris Zankel <chris@zankel.net>2009-04-16 00:25:39 -0700
committerChris Zankel <chris@zankel.net>2009-05-11 21:48:17 -0700
commit35e71f90687fd904b43e3427673827ac3e77b4d1 (patch)
treea87913c620e6746d2070b4e963953f54af120874 /arch
parent1d80cac0fe44fb87b2a3d35fddd7f534ea81cd90 (diff)
downloadlinux-3.10-35e71f90687fd904b43e3427673827ac3e77b4d1.tar.gz
linux-3.10-35e71f90687fd904b43e3427673827ac3e77b4d1.tar.bz2
linux-3.10-35e71f90687fd904b43e3427673827ac3e77b4d1.zip
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')
-rw-r--r--arch/xtensa/Kconfig6
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig
index fa6dc4dd3b1..30d21a9e2ef 100644
--- a/arch/xtensa/Kconfig
+++ b/arch/xtensa/Kconfig
@@ -137,6 +137,8 @@ config PCI
source "drivers/pci/Kconfig"
+endmenu
+
menu "Platform options"
choice
@@ -153,8 +155,6 @@ config XTENSA_PLATFORM_ISS
config XTENSA_PLATFORM_XT2000
bool "XT2000"
- select XTENSA_CALIBRATE_CCOUNT
- select PCI
help
XT2000 is the name of Tensilica's feature-rich emulation platform.
This hardware is capable of running a full Linux distribution.
@@ -192,8 +192,6 @@ config CMDLINE
source "mm/Kconfig"
-endmenu
-
config HOTPLUG
bool "Support for hot-pluggable devices"
help