X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=arch%2Fi386%2Fkernel%2Fapic-xen.c;h=d7bff414d655ea9a3e3028a9ecf8310049b9c69f;hb=16c70f8c1b54b61c3b951b6fb220df250fe09b32;hp=ecd4b69f02c3af746fa46e6927760d5dc984b933;hpb=4e76c8a9fa413ccc09d3f7f664183dcce3555d57;p=linux-2.6.git

diff --git a/arch/i386/kernel/apic-xen.c b/arch/i386/kernel/apic-xen.c
index ecd4b69f0..d7bff414d 100644
--- a/arch/i386/kernel/apic-xen.c
+++ b/arch/i386/kernel/apic-xen.c
@@ -14,7 +14,6 @@
  *	Mikael Pettersson	:	PM converted to driver model.
  */
 
-#include <linux/config.h>
 #include <linux/init.h>
 
 #include <linux/mm.h>
@@ -36,6 +35,7 @@
 #include <asm/arch_hooks.h>
 #include <asm/hpet.h>
 #include <asm/i8253.h>
+#include <asm/nmi.h>
 
 #include <mach_apic.h>
 #include <mach_apicdef.h>
@@ -61,7 +61,7 @@ int enable_local_apic __initdata = 0; /* -1=force-disable, +1=force-enable */
  */
 int apic_verbosity;
 
-int modern_apic(void)
+static int modern_apic(void)
 {
 #ifndef CONFIG_XEN
 	unsigned int lvr, version;