Merge branch 'irq-fix' of git://www.modarm9.com/gitsrc/pub/people/ukleinek/linux...

[linux-2.6] / arch / xtensa / Kconfig

diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig
index d3cb3d6af4c8da3249b4e4cda5602724831dd549..9fc8551a1cf685c53fce6564a004d40642bf3acc 100644 (file)
--- a/arch/xtensa/Kconfig
+++ b/arch/xtensa/Kconfig
@@ -14,6 +14,7 @@ config ZONE_DMA
 config XTENSA
        bool
        default y
 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
        help
          Xtensa processors are 32-bit RISC machines designed by Tensilica
          primarily for embedded systems.  These processors are both


@@ -49,6 +50,10 @@ config ARCH_HAS_ILOG2_U64
 config NO_IOPORT
        def_bool y
 
 config NO_IOPORT
        def_bool y
 

+config HZ
+       int
+       default 100
+

 source "init/Kconfig"
 
 menu "Processor type and features"
 source "init/Kconfig"
 
 menu "Processor type and features"


@@ -174,11 +179,6 @@ config PCI
          your box. Other bus systems are ISA, EISA, MicroChannel (MCA) or
          VESA. If you have PCI, say Y, otherwise N.
 
          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
 source "drivers/pci/Kconfig"
 
 config HOTPLUG


@@ -251,8 +251,6 @@ config EMBEDDED_RAMDISK_IMAGE
          provide one yourself.
 endmenu
 
          provide one yourself.
 endmenu
 

-source "kernel/Kconfig.instrumentation"
-

 source "arch/xtensa/Kconfig.debug"
 
 source "security/Kconfig"
 source "arch/xtensa/Kconfig.debug"
 
 source "security/Kconfig"