Merge branch 'irq-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip...

[safe/jmp/linux-2.6] / arch / xtensa / Kconfig

diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig
index 7fbb44b..9812008 100644 (file)
--- a/arch/xtensa/Kconfig
+++ b/arch/xtensa/Kconfig
@@ -1,5 +1,5 @@
 # For a description of the syntax of this configuration file,
-# see Documentation/kbuild/config-language.txt.
+# see Documentation/kbuild/kconfig-language.txt.
 
 mainmenu "Linux/Xtensa Kernel Configuration"
 
@@ -14,6 +14,7 @@ config ZONE_DMA
 config XTENSA
        bool
        default y
+       select HAVE_IDE
        help
          Xtensa processors are 32-bit RISC machines designed by Tensilica
          primarily for embedded systems.  These processors are both
@@ -49,7 +50,12 @@ config ARCH_HAS_ILOG2_U64
 config NO_IOPORT
        def_bool y
 
+config HZ
+       int
+       default 100
+
 source "init/Kconfig"
+source "kernel/Kconfig.freezer"
 
 menu "Processor type and features"
 
@@ -58,7 +64,12 @@ choice
        default XTENSA_VARIANT_FSF
 
 config XTENSA_VARIANT_FSF
-       bool "fsf"
+       bool "fsf - default (not generic) configuration"
+
+config XTENSA_VARIANT_DC232B
+       bool "dc232b - Diamond 232L Standard Core Rev.B (LE)"
+       help
+       This variant refers to Tensilica's Diamond 232L Standard core Rev.B (LE).
 endchoice
 
 config MMU
@@ -92,9 +103,6 @@ config MATH_EMULATION
        help
        Can we use information of configuration file?
 
-config HIGHMEM
-       bool "High memory support"
-
 endmenu
 
 menu "Platform options"
@@ -174,11 +182,6 @@ config PCI
          your box. Other bus systems are ISA, EISA, MicroChannel (MCA) or
          VESA. If you have PCI, say Y, otherwise N.
 
-         The PCI-HOWTO, available from
-         <http://www.linuxdoc.org/docs.html#howto>, contains valuable
-         information about which PCI hardware does work under Linux and which
-         doesn't
-
 source "drivers/pci/Kconfig"
 
 config HOTPLUG
@@ -194,8 +197,8 @@ config HOTPLUG
        plugged into slots found on all modern laptop computers.  Another
        example, used on modern desktops as well as laptops, is USB.
 
-       Enable HOTPLUG and KMOD, and build a modular kernel.  Get agent
-       software (at <http://linux-hotplug.sourceforge.net/>) and install it.
+       Enable HOTPLUG and build a modular kernel.  Get agent software
+       (from <http://linux-hotplug.sourceforge.net/>) and install it.
        Then your kernel will automatically call out to a user mode "policy
        agent" (/sbin/hotplug) to load modules and set up software needed
        to use devices as you hotplug them.