Merge branch 'x86/amd-nb' into x86/apic-cleanups
[~shefty/rdma-dev.git] / arch / x86 / kernel / apic / apic.c
index 463839645f9b4feb187554934ddfeb48fc1e5e87..c48a645108447612611c602b45eeb629ef8dc1b9 100644 (file)
@@ -52,7 +52,6 @@
 #include <asm/mce.h>
 #include <asm/kvm_para.h>
 #include <asm/tsc.h>
-#include <asm/atomic.h>
 
 unsigned int num_processors;