3 files changed, 6 insertions, 2 deletions

diff --git a/arch/x86_64/Kconfig b/arch/x86_64/Kconfig
index 1f4212605ef8..c2c68b902347 100644
--- a/arch/x86_64/Kconfig
+++ b/arch/x86_64/Kconfig
@@ -105,6 +105,7 @@ config X86_PC
 
 config X86_VSMP
         bool "Support for ScaleMP vSMP"
+        depends on PCI
          help
           Support for ScaleMP vSMP systems.  Say 'Y' here if this kernel is
           supposed to run on these EM64T-based machines.  Only choose this option
@@ -291,7 +292,7 @@ config NUMA
 
 config K8_NUMA
        bool "Old style AMD Opteron NUMA detection"
-       depends on NUMA
+       depends on NUMA && PCI
        default y
        help
          Enable K8 NUMA node topology detection.  You should say Y here if
diff --git a/arch/x86_64/kernel/Makefile b/arch/x86_64/kernel/Makefile
index 000e67e8f028..2466fbd035ee 100644
--- a/arch/x86_64/kernel/Makefile
+++ b/arch/x86_64/kernel/Makefile
@@ -8,7 +8,7 @@ obj-y	:= process.o signal.o entry.o traps.o irq.o \
                 ptrace.o time.o ioport.o ldt.o setup.o i8259.o sys_x86_64.o \
                 x8664_ksyms.o i387.o syscall.o vsyscall.o \
                 setup64.o bootflag.o e820.o reboot.o quirks.o i8237.o \
-                pci-dma.o pci-nommu.o alternative.o early-quirks.o
+                pci-dma.o pci-nommu.o alternative.o
 
 obj-$(CONFIG_STACKTRACE)        += stacktrace.o
 obj-$(CONFIG_X86_MCE)         += mce.o
@@ -39,6 +39,7 @@ obj-$(CONFIG_K8_NB)		+= k8.o
 obj-$(CONFIG_AUDIT)             += audit.o
 
 obj-$(CONFIG_MODULES)           += module.o
+obj-$(CONFIG_PCI)               += early-quirks.o
 
 obj-y                           += topology.o
 obj-y                           += intel_cacheinfo.o
diff --git a/arch/x86_64/kernel/setup.c b/arch/x86_64/kernel/setup.c
index 26524ce3b239..3d8309b1236e 100644
--- a/arch/x86_64/kernel/setup.c
+++ b/arch/x86_64/kernel/setup.c
@@ -493,7 +493,9 @@ void __init setup_arch(char **cmdline_p)
 
         paging_init();
 
+#ifdef CONFIG_PCI
         early_quirks();
+#endif
 
         /*
          * set this early, so we dont allocate cpu0