Merge master.kernel.org:/home/rmk/linux-2.6-serial

[~andy/linux] / include / asm-i386 / msi.h

diff --git a/include/asm-i386/msi.h b/include/asm-i386/msi.h
index b85393094c832085a5a0487fd49745f176ff261c..f041d4495fafeb1a5fdc44791561415f1b673684 100644 (file)
--- a/include/asm-i386/msi.h
+++ b/include/asm-i386/msi.h
@@ -10,13 +10,6 @@
 #include <mach_apic.h>
 
 #define LAST_DEVICE_VECTOR             232
-#define MSI_DEST_MODE                  MSI_LOGICAL_MODE
-#define MSI_TARGET_CPU_SHIFT           12
-
-#ifdef CONFIG_SMP
-#define MSI_TARGET_CPU         logical_smp_processor_id()
-#else
-#define MSI_TARGET_CPU cpu_to_logical_apicid(first_cpu(cpu_online_map))
-#endif
+#define MSI_TARGET_CPU_SHIFT   12
 
 #endif /* ASM_MSI_H */