diff -urN -X /usr/share/dontdiff linux.vanilla/arch/i386/config.in linux/arch/i386/config.in
--- linux.vanilla/arch/i386/config.in	Thu Jun 13 00:30:57 2002
+++ linux/arch/i386/config.in	Wed Jun 12 20:25:15 2002
@@ -425,11 +425,6 @@
    fi
 fi
 
-if [ "$CONFIG_X86_LOCAL_APIC" = "y" ]; then
-   define_bool CONFIG_X86_EXTRA_IRQS y
-   define_bool CONFIG_X86_FIND_SMP_CONFIG y
-fi
-
 endmenu
 
 source lib/Config.in
@@ -443,6 +438,13 @@
    if [ "$CONFIG_SMP" = "y" ]; then
       define_bool CONFIG_X86_SMP y
       define_bool CONFIG_X86_HT y
+      define_bool CONFIG_X86_IO_APIC y
+      define_bool CONFIG_X86_LOCAL_APIC y
    fi
    define_bool CONFIG_X86_BIOS_REBOOT y
+fi
+
+if [ "$CONFIG_X86_LOCAL_APIC" = "y" ]; then
+   define_bool CONFIG_X86_EXTRA_IRQS y
+   define_bool CONFIG_X86_FIND_SMP_CONFIG y
 fi
diff -urN -X /usr/share/dontdiff linux.vanilla/arch/i386/generic/Makefile linux/arch/i386/generic/Makefile
--- linux.vanilla/arch/i386/generic/Makefile	Thu Jun 13 00:30:50 2002
+++ linux/arch/i386/generic/Makefile	Thu Jun 13 00:38:25 2002
@@ -18,7 +18,6 @@
 
 obj-y				:= setup.o
 
-obj-$(CONFIG_PCI)		+= pci-pc.o pci-irq.o
 obj-$(CONFIG_X86_LOCAL_APIC)	+= mpparse.o
 
 include $(TOPDIR)/Rules.make