Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[mv-sheeva.git] / arch / powerpc / Kconfig

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index e641bb68d8714488b8332f44a4049171f507df6b..00099efe0e9f8e79c21d6eec9aae86858e6fb080 100644 (file)
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -92,6 +92,9 @@ config ARCH_MAY_HAVE_PC_FDC
 config PPC_OF
        def_bool y
 
+config OF
+       def_bool y
+
 config PPC_UDBG_16550
        bool
        default n
@@ -408,11 +411,6 @@ config PPC_INDIRECT_PCI
        default y if 40x || 44x
        default n
 
-config PPC_INDIRECT_PCI_BE
-       bool
-       depends PPC_INDIRECT_PCI
-       default n
-
 config EISA
        bool
 
@@ -422,6 +420,10 @@ config SBUS
 config FSL_SOC
        bool
 
+config FSL_PCI
+       bool
+       select PPC_INDIRECT_PCI
+
 # Yes MCA RS/6000s exist but Linux-PPC does not currently support any
 config MCA
        bool
@@ -640,8 +642,8 @@ menu "Instrumentation Support"
 source "arch/powerpc/oprofile/Kconfig"
 
 config KPROBES
-       bool "Kprobes (EXPERIMENTAL)"
-       depends on !BOOKE && !4xx && KALLSYMS && EXPERIMENTAL && MODULES
+       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