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

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

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index ccc5410af996a5cf87a45d6e2eda9a7a97f31df6..6beee32144c02e45456c5e8c037e8630b1b6f7bb 100644 (file)
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -118,6 +118,7 @@ config GENERIC_BUG
        depends on BUG
 
 config SYS_SUPPORTS_APM_EMULATION
+       default y if PMAC_APM_EMU
        bool
 
 config DEFAULT_UIMAGE
@@ -389,6 +390,9 @@ config NOT_COHERENT_CACHE
        bool
        depends on 4xx || 8xx || E200
        default y
+
+config CONFIG_CHECK_CACHE_COHERENCY
+       bool
 endmenu
 
 source "init/Kconfig"
@@ -451,7 +455,7 @@ config ARCH_ENABLE_MEMORY_HOTPLUG
 
 config KEXEC
        bool "kexec system call (EXPERIMENTAL)"
-       depends on PPC_MULTIPLATFORM && EXPERIMENTAL
+       depends on (PPC_PRPMC2800 || PPC_MULTIPLATFORM) && EXPERIMENTAL
        help
          kexec is a system call that implements the ability to shutdown your
          current kernel, and to start another kernel.  It is like a reboot
@@ -694,8 +698,10 @@ config PCI
          infrastructure code to support PCI bus devices.
 
 config PCI_DOMAINS
-       bool
-       default PCI
+       def_bool PCI
+
+config PCI_SYSCALL
+       def_bool PCI
 
 config PCI_QSPAN
        bool "QSpan PCI"