projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
[linux-2.6-block.git]
/
arch
/
x86
/
kernel
/
x86_init.c
diff --git
a/arch/x86/kernel/x86_init.c
b/arch/x86/kernel/x86_init.c
index cd6da6bf3ecaf7c24b9b9848c31d313c741d0f16..ceb2911aa439dcb87ac0ef07a8d700f4a5a274e7 100644
(file)
--- a/
arch/x86/kernel/x86_init.c
+++ b/
arch/x86/kernel/x86_init.c
@@
-6,10
+6,12
@@
#include <linux/init.h>
#include <linux/ioport.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/ioport.h>
#include <linux/module.h>
+#include <linux/pci.h>
#include <asm/bios_ebda.h>
#include <asm/paravirt.h>
#include <asm/pci_x86.h>
#include <asm/bios_ebda.h>
#include <asm/paravirt.h>
#include <asm/pci_x86.h>
+#include <asm/pci.h>
#include <asm/mpspec.h>
#include <asm/setup.h>
#include <asm/apic.h>
#include <asm/mpspec.h>
#include <asm/setup.h>
#include <asm/apic.h>
@@
-99,3
+101,8
@@
struct x86_platform_ops x86_platform = {
};
EXPORT_SYMBOL_GPL(x86_platform);
};
EXPORT_SYMBOL_GPL(x86_platform);
+struct x86_msi_ops x86_msi = {
+ .setup_msi_irqs = native_setup_msi_irqs,
+ .teardown_msi_irq = native_teardown_msi_irq,
+ .teardown_msi_irqs = default_teardown_msi_irqs,
+};