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

[linux-2.6-omap-h63xx.git] / include / asm-i386 / msi.h

diff --git a/include/asm-i386/msi.h b/include/asm-i386/msi.h
index b85393094c832085a5a0487fd49745f176ff261c..b11c4b7dfaeffce9833a264cadb0f484e38fee2f 100644 (file)
--- a/include/asm-i386/msi.h
+++ b/include/asm-i386/msi.h
@@ -9,14 +9,15 @@
 #include <asm/desc.h>
 #include <mach_apic.h>
 
-#define LAST_DEVICE_VECTOR             232
-#define MSI_DEST_MODE                  MSI_LOGICAL_MODE
-#define MSI_TARGET_CPU_SHIFT           12
+#define LAST_DEVICE_VECTOR     (FIRST_SYSTEM_VECTOR - 1)
+#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
+extern struct msi_ops msi_apic_ops;
+
+static inline int msi_arch_init(void)
+{
+       msi_register(&msi_apic_ops);
+       return 0;
+}
 
 #endif /* ASM_MSI_H */