powerpc: Fix a build problem on ppc32 with new DMA_ATTRs

[linux-2.6-omap-h63xx.git] / arch / powerpc / Kconfig

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index fdc755a05f7066359bd0831282fa8c909a8ccd3c..06b72771ae22991507d727663343fd0e8b406d86 100644 (file)
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -53,6 +53,9 @@ config STACKTRACE_SUPPORT
        bool
        default y
 
+config HAVE_LATENCYTOP_SUPPORT
+       def_bool y
+
 config TRACE_IRQFLAGS_SUPPORT
        bool
        depends on PPC64
@@ -110,6 +113,7 @@ config PPC
        select HAVE_KPROBES
        select HAVE_KRETPROBES
        select HAVE_LMB
+       select HAVE_DMA_ATTRS if PPC64
 
 config EARLY_PRINTK
        bool
@@ -308,8 +312,8 @@ config KEXEC
          strongly in flux, so no good recommendation can be made.
 
 config CRASH_DUMP
-       bool "Build a kdump crash kernel (EXPERIMENTAL)"
-       depends on PPC_MULTIPLATFORM && PPC64 && EXPERIMENTAL
+       bool "Build a kdump crash kernel"
+       depends on PPC_MULTIPLATFORM && PPC64
        help
          Build a kernel suitable for use as a kdump capture kernel.
          The kernel will be linked at a different address than normal, and
@@ -458,6 +462,19 @@ config CMDLINE
          some command-line options at build time by entering them here.  In
          most cases you will need to specify the root device here.
 
+config EXTRA_TARGETS
+       string "Additional default image types"
+       help
+         List additional targets to be built by the bootwrapper here (separated
+         by spaces).  This is useful for targets that depend of device tree
+         files in the .dts directory.
+
+         Targets in this list will be build as part of the default build
+         target, or when the user does a 'make zImage' or a
+         'make zImage.initrd'.
+
+         If unsure, leave blank
+
 if !44x || BROKEN
 config ARCH_WANTS_FREEZER_CONTROL
        def_bool y
@@ -538,6 +555,12 @@ config FSL_LBC
        help
          Freescale Localbus support
 
+config FSL_GTM
+       bool
+       depends on PPC_83xx || QUICC_ENGINE || CPM2
+       help
+         Freescale General-purpose Timers support
+
 # Yes MCA RS/6000s exist but Linux-PPC does not currently support any
 config MCA
        bool
@@ -608,6 +631,19 @@ source "drivers/pcmcia/Kconfig"
 
 source "drivers/pci/hotplug/Kconfig"
 
+config HAS_RAPIDIO
+       bool
+       default n
+
+config RAPIDIO
+       bool "RapidIO support"
+       depends on HAS_RAPIDIO
+       help
+         If you say Y here, the kernel will include drivers and
+         infrastructure code to support RapidIO interconnect devices.
+
+source "drivers/rapidio/Kconfig"
+
 endmenu
 
 menu "Advanced setup"
@@ -626,20 +662,6 @@ config ADVANCED_OPTIONS
 comment "Default settings for advanced configuration options are used"
        depends on !ADVANCED_OPTIONS
 
-config HIGHMEM_START_BOOL
-       bool "Set high memory pool address"
-       depends on ADVANCED_OPTIONS && HIGHMEM
-       help
-         This option allows you to set the base address of the kernel virtual
-         area used to map high memory pages.  This can be useful in
-         optimizing the layout of kernel virtual memory.
-
-         Say N here unless you know what you are doing.
-
-config HIGHMEM_START
-       hex "Virtual start address of high memory pool" if HIGHMEM_START_BOOL
-       default "0xfe000000"
-
 config LOWMEM_SIZE_BOOL
        bool "Set maximum low memory"
        depends on ADVANCED_OPTIONS
@@ -817,3 +839,4 @@ config PPC_CLOCK
 config PPC_LIB_RHEAP
        bool
 
+source "arch/powerpc/kvm/Kconfig"