Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

[linux-2.6-block.git] / arch / powerpc / Kconfig

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index cbfbd981cdcd299b87a47ef0d5e30d33f25f2e8a..e641bb68d8714488b8332f44a4049171f507df6b 100644 (file)
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -56,6 +56,9 @@ config GENERIC_FIND_NEXT_BIT
        bool
        default y
 
+config ARCH_NO_VIRT_TO_BUS
+       def_bool PPC64
+
 config PPC
        bool
        default y
@@ -439,8 +442,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"