Pull battery-sbs-ac into release branch

[linux-2.6] / arch / ppc / Kconfig

diff --git a/arch/ppc/Kconfig b/arch/ppc/Kconfig
index ccce2a4a1522f574b49dacf261108a4b43068f09..6bdeeb70b157856a00b6ce22c397a74abeb0d803 100644 (file)
--- a/arch/ppc/Kconfig
+++ b/arch/ppc/Kconfig
@@ -1237,8 +1237,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 MPC83xx_PCI2
        bool "Support for 2nd PCI host controller"