[MIPS] unexport __kmap_atomic_to_page

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

diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig
index 7ee4a14..9fc8551 100644 (file)
--- a/arch/xtensa/Kconfig
+++ b/arch/xtensa/Kconfig
@@ -1,5 +1,5 @@
 # For a description of the syntax of this configuration file,
 # 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"
 
 
 mainmenu "Linux/Xtensa Kernel Configuration"
 


@@ -7,9 +7,14 @@ config FRAME_POINTER
        bool
        default n
 
        bool
        default n
 

+config ZONE_DMA
+       bool
+       default y
+

 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


@@ -22,35 +27,43 @@ config RWSEM_XCHGADD_ALGORITHM
        bool
        default y
 
        bool
        default y
 

+config GENERIC_FIND_NEXT_BIT
+       bool
+       default y
+
+config GENERIC_HWEIGHT
+       bool
+       default y
+

 config GENERIC_HARDIRQS
        bool
        default y
 
 config GENERIC_HARDIRQS
        bool
        default y
 

+config ARCH_HAS_ILOG2_U32
+       bool
+       default n
+
+config ARCH_HAS_ILOG2_U64
+       bool
+       default n
+
+config NO_IOPORT
+       def_bool y
+
+config HZ
+       int
+       default 100
+

 source "init/Kconfig"
 
 menu "Processor type and features"
 
 choice
        prompt "Xtensa Processor Configuration"
 source "init/Kconfig"
 
 menu "Processor type and features"
 
 choice
        prompt "Xtensa Processor Configuration"

-       default XTENSA_CPU_LINUX_BE
+       default XTENSA_VARIANT_FSF

 
 

-config XTENSA_CPU_LINUX_BE
-       bool "linux_be"
-       ---help---
-         The linux_be processor configuration is the baseline Xtensa
-         configurations included in this kernel and also used by
-         binutils, gcc, and gdb. It contains no TIE, no coprocessors,
-         and the following configuration options:
-
-         Code Density Option                2 Misc Special Registers
-         NSA/NSAU Instructions              128-bit Data Bus Width
-         Processor ID                       8K, 2-way I and D Caches
-         Zero-Overhead Loops                2 Inst Address Break Registers
-         Big Endian                         2 Data Address Break Registers
-         64 General-Purpose Registers       JTAG Interface and Trace Port
-         17 Interrupts                      MMU w/ TLBs and Autorefill
-         3 Interrupt Levels                 8 Autorefill Ways (I/D TLBs)
-         3 Timers                           Unaligned Exceptions
+config XTENSA_VARIANT_FSF
+       bool "fsf"

 endchoice
 
 config MMU
 endchoice
 
 config MMU


@@ -166,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


@@ -198,7 +206,7 @@ source "drivers/pci/hotplug/Kconfig"
 
 endmenu
 
 
 endmenu
 

-menu "Exectuable file formats"
+menu "Executable file formats"

 
 # only elf supported
 config KCORE_ELF
 
 # only elf supported
 config KCORE_ELF


@@ -233,7 +241,7 @@ menu "Xtensa initrd options"
        bool "Embed root filesystem ramdisk into the kernel"
 
 config EMBEDDED_RAMDISK_IMAGE
        bool "Embed root filesystem ramdisk into the kernel"
 
 config EMBEDDED_RAMDISK_IMAGE

-       string "Filename of gziped ramdisk image"
+       string "Filename of gzipped ramdisk image"

        depends on EMBEDDED_RAMDISK
        default "ramdisk.gz"
        help
        depends on EMBEDDED_RAMDISK
        default "ramdisk.gz"
        help