8 files changed, 26 insertions, 11 deletions

diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig
index 79c6e5a24456..2a85dc33907c 100644
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
@@ -327,6 +327,9 @@ config PCI_DOMAINS
         bool
         default y
 
+config PCI_SYSCALL
+        def_bool PCI
+
 config ALPHA_CORE_AGP
         bool
         depends on ALPHA_GENERIC || ALPHA_TITAN || ALPHA_MARVEL
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 50d9f3e4e0f1..482d33f9ce5b 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -531,6 +531,9 @@ config PCI
           information about which PCI hardware does work under Linux and which
           doesn't.
 
+config PCI_SYSCALL
+        def_bool PCI
+
 # Select the host bridge type
 config PCI_HOST_VIA82C505
         bool
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index de1bff659969..db9ddff95841 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -520,8 +520,10 @@ config PCI
           here unless you are using a simulator without PCI support.
 
 config PCI_DOMAINS
-        bool
-        default PCI
+        def_bool PCI
+
+config PCI_SYSCALL
+        def_bool PCI
 
 source "drivers/pci/pcie/Kconfig"
 
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 5eaeafd30bdf..6beee32144c0 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -698,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"
diff --git a/arch/ppc/Kconfig b/arch/ppc/Kconfig
index ccce2a4a1522..6bdeeb70b157 100644
--- 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"
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index fbcc00c6c06e..8567cc901942 100644
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -210,6 +210,9 @@ config PCI
           CP-1200, JavaEngine-1, Corona, Red October, and Serengeti SGSC.
           All of these platforms are extremely obscure, so say N if unsure.
 
+config PCI_SYSCALL
+        def_bool PCI
+
 source "drivers/pci/Kconfig"
 
 endif
diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig
index 89a1b469b93d..6566d13db04f 100644
--- a/arch/sparc64/Kconfig
+++ b/arch/sparc64/Kconfig
@@ -320,8 +320,10 @@ config PCI
           doesn't.
 
 config PCI_DOMAINS
-        bool
-        default PCI
+        def_bool PCI
+
+config PCI_SYSCALL
+        def_bool PCI
 
 source "drivers/pci/Kconfig"
 
diff --git a/drivers/pci/Makefile b/drivers/pci/Makefile
index e3beb784406f..006054a40995 100644
--- a/drivers/pci/Makefile
+++ b/drivers/pci/Makefile
@@ -41,9 +41,7 @@ obj-$(CONFIG_ACPI)    += pci-acpi.o
 # Cardbus & CompactPCI use setup-bus
 obj-$(CONFIG_HOTPLUG) += setup-bus.o
 
-ifndef CONFIG_X86
-obj-y += syscall.o
-endif
+obj-$(CONFIG_PCI_SYSCALL) += syscall.o
 
 ifeq ($(CONFIG_PCI_DEBUG),y)
 EXTRA_CFLAGS += -DDEBUG