[ARM] 4652/1: pxa: fix a typo of pxa27x usb host clk definition

[linux-2.6] / arch / xtensa / Kconfig

diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig
index 2e74cb0b7807fd986fa4993e9baf4044f8c015f9..d3cb3d6af4c8da3249b4e4cda5602724831dd549 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"
 
@@ -7,6 +7,10 @@ config FRAME_POINTER
        bool
        default n
 
+config ZONE_DMA
+       bool
+       default y
+
 config XTENSA
        bool
        default y
@@ -42,6 +46,9 @@ config ARCH_HAS_ILOG2_U64
        bool
        default n
 
+config NO_IOPORT
+       def_bool y
+
 source "init/Kconfig"
 
 menu "Processor type and features"
@@ -244,6 +251,8 @@ config EMBEDDED_RAMDISK_IMAGE
          provide one yourself.
 endmenu
 
+source "kernel/Kconfig.instrumentation"
+
 source "arch/xtensa/Kconfig.debug"
 
 source "security/Kconfig"