- patches.apparmor/remove_suid_new_case_in_2.6.22.diff: Merge fix.

[linux-flexiantxendom0-3.2.10.git] / arch / i386 / kernel / cpu / Makefile

diff --git a/arch/i386/kernel/cpu/Makefile b/arch/i386/kernel/cpu/Makefile
index 753f1d7..74f27a4 100644 (file)
--- a/arch/i386/kernel/cpu/Makefile
+++ b/arch/i386/kernel/cpu/Makefile
@@ -2,7 +2,7 @@
 # Makefile for x86-compatible CPU details and quirks
 #
 
-obj-y  :=      common.o proc.o
+obj-y  :=      common.o proc.o bugs.o
 
 obj-y  +=      amd.o
 obj-y  +=      cyrix.o
@@ -18,7 +18,4 @@ obj-$(CONFIG_X86_MCE) +=      mcheck/
 obj-$(CONFIG_MTRR)     +=      mtrr/
 obj-$(CONFIG_CPU_FREQ) +=      cpufreq/
 
-ifdef CONFIG_XEN
-include $(srctree)/scripts/Makefile.xen
-obj-y := $(call cherrypickxen, $(obj-y), $(src))
-endif
+obj-$(CONFIG_X86_LOCAL_APIC) += perfctr-watchdog.o