git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'topic/asoc' into for-linus
[pandora-kernel.git]
/
arch
/
xtensa
/
Kconfig
diff --git
a/arch/xtensa/Kconfig
b/arch/xtensa/Kconfig
index
fa6dc4d
..
ebe228d
100644
(file)
--- a/
arch/xtensa/Kconfig
+++ b/
arch/xtensa/Kconfig
@@
-80,6
+80,7
@@
config XTENSA_VARIANT_S6000
bool "s6000 - Stretch software configurable processor"
select VARIANT_IRQ_SWITCH
select ARCH_REQUIRE_GPIOLIB
bool "s6000 - Stretch software configurable processor"
select VARIANT_IRQ_SWITCH
select ARCH_REQUIRE_GPIOLIB
+ select XTENSA_CALIBRATE_CCOUNT
endchoice
config XTENSA_UNALIGNED_USER
endchoice
config XTENSA_UNALIGNED_USER
@@
-137,6
+138,8
@@
config PCI
source "drivers/pci/Kconfig"
source "drivers/pci/Kconfig"
+endmenu
+
menu "Platform options"
choice
menu "Platform options"
choice
@@
-153,8
+156,6
@@
config XTENSA_PLATFORM_ISS
config XTENSA_PLATFORM_XT2000
bool "XT2000"
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.
help
XT2000 is the name of Tensilica's feature-rich emulation platform.
This hardware is capable of running a full Linux distribution.
@@
-192,8
+193,6
@@
config CMDLINE
source "mm/Kconfig"
source "mm/Kconfig"
-endmenu
-
config HOTPLUG
bool "Support for hot-pluggable devices"
help
config HOTPLUG
bool "Support for hot-pluggable devices"
help