[POWERPC] 4xx: Wire up 440EP USB controller support to Bamboo board

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

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index d11a746975bc26b608cc7ba85f8d0ccdea25ef44..66a3d8cee5cfa085151531a5e2f6801b48b27048 100644 (file)
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -160,11 +160,13 @@ config PPC_DCR
 
 config PPC_OF_PLATFORM_PCI
        bool
+       depends on PCI
        depends on PPC64 # not supported on 32 bits yet
        default n
 
 source "init/Kconfig"
 
+source "arch/powerpc/sysdev/Kconfig"
 source "arch/powerpc/platforms/Kconfig"
 
 menu "Kernel options"
@@ -187,6 +189,11 @@ config FORCE_MAX_ZONEORDER
        default "9" if PPC_64K_PAGES
        default "13"
 
+config HUGETLB_PAGE_SIZE_VARIABLE
+       bool
+       depends on HUGETLB_PAGE
+       default y
+
 config MATH_EMULATION
        bool "Math emulation"
        depends on 4xx || 8xx || E200 || PPC_MPC832x || E500
@@ -412,7 +419,7 @@ endmenu
 
 config ISA_DMA_API
        bool
-       default y
+       default !PPC_ISERIES || PCI
 
 menu "Bus options"
 
@@ -669,20 +676,7 @@ source "arch/powerpc/sysdev/qe_lib/Kconfig"
 
 source "lib/Kconfig"
 
-menu "Instrumentation Support"
-
-source "arch/powerpc/oprofile/Kconfig"
-
-config KPROBES
-       bool "Kprobes"
-       depends on !BOOKE && !4xx && KALLSYMS && MODULES
-       help
-         Kprobes allows you to trap at almost any kernel address and
-         execute a callback function.  register_kprobe() establishes
-         a probepoint and specifies the callback.  Kprobes is useful
-         for kernel debugging, non-intrusive instrumentation and testing.
-         If in doubt, say "N".
-endmenu
+source "kernel/Kconfig.instrumentation"
 
 source "arch/powerpc/Kconfig.debug"
 
@@ -698,3 +692,7 @@ source "crypto/Kconfig"
 config PPC_CLOCK
        bool
        default n
+
+config PPC_LIB_RHEAP
+       bool
+