Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-x86

[sfrench/cifs-2.6.git] / include / asm-x86 / smp_32.h

diff --git a/include/asm-x86/smp_32.h b/include/asm-x86/smp_32.h
index 9006f6041bf8e7615c374f142e6e1d6ffd82b830..7056d86845221c6d224545f7c8642a35c7cd028f 100644 (file)
--- a/include/asm-x86/smp_32.h
+++ b/include/asm-x86/smp_32.h
@@ -11,7 +11,7 @@
 #endif
 
 #if defined(CONFIG_X86_LOCAL_APIC) && !defined(__ASSEMBLY__)
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include <asm/mpspec.h>
 #include <asm/apic.h>
 #ifdef CONFIG_X86_IO_APIC