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

[linux-2.6] / arch / i386 / kernel / time.c

diff --git a/arch/i386/kernel/time.c b/arch/i386/kernel/time.c
index e68d9fdb075962769a100f2eedce167187945463..2854c357377f18c8d98447e296dd63e3d877fb21 100644 (file)
--- a/arch/i386/kernel/time.c
+++ b/arch/i386/kernel/time.c
@@ -68,7 +68,8 @@
 
 #include "io_ports.h"
 
-extern spinlock_t i8259A_lock;
+#include <asm/i8259.h>
+
 int pit_latch_buggy;              /* extern */
 
 #include "do_timer.h"
@@ -85,6 +86,8 @@ extern unsigned long wall_jiffies;
 DEFINE_SPINLOCK(rtc_lock);
 EXPORT_SYMBOL(rtc_lock);
 
+#include <asm/i8253.h>
+
 DEFINE_SPINLOCK(i8253_lock);
 EXPORT_SYMBOL(i8253_lock);