git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'linus' into x86/urgent
[pandora-kernel.git]
/
arch
/
x86
/
kernel
/
vsmp_64.c
diff --git
a/arch/x86/kernel/vsmp_64.c
b/arch/x86/kernel/vsmp_64.c
index
caf2a26
..
0c029e8
100644
(file)
--- a/
arch/x86/kernel/vsmp_64.c
+++ b/
arch/x86/kernel/vsmp_64.c
@@
-15,9
+15,12
@@
#include <linux/init.h>
#include <linux/pci_ids.h>
#include <linux/pci_regs.h>
#include <linux/init.h>
#include <linux/pci_ids.h>
#include <linux/pci_regs.h>
+
+#include <asm/apic.h>
#include <asm/pci-direct.h>
#include <asm/io.h>
#include <asm/paravirt.h>
#include <asm/pci-direct.h>
#include <asm/io.h>
#include <asm/paravirt.h>
+#include <asm/setup.h>
#if defined CONFIG_PCI && defined CONFIG_PARAVIRT
/*
#if defined CONFIG_PCI && defined CONFIG_PARAVIRT
/*
@@
-133,7
+136,7
@@
int is_vsmp_box(void)
}
}
#else
}
}
#else
-static
int
__init detect_vsmp_box(void)
+static
void
__init detect_vsmp_box(void)
{
}
int is_vsmp_box(void)
{
}
int is_vsmp_box(void)