diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-07-04 14:14:42 +0100 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-07-04 14:14:42 +0100 |
| commit | 07929dcb963786512c760dd3ecd148d89295e7e5 (patch) | |
| tree | f5db01392ebb968b4c8acb5a6b3b03a833bfcb02 /arch/i386/kernel/time.c | |
| parent | c2d9b8387bce8b4a0fd402fab7dc1319d11a418d (diff) | |
| parent | 19f7241a3b087bbf4dd107c979608fdb56c83a09 (diff) | |
| download | kernel_samsung_smdk4412-07929dcb963786512c760dd3ecd148d89295e7e5.tar.gz kernel_samsung_smdk4412-07929dcb963786512c760dd3ecd148d89295e7e5.tar.bz2 kernel_samsung_smdk4412-07929dcb963786512c760dd3ecd148d89295e7e5.zip | |
Automatic merge with /usr/src/ntfs-2.6.git.
Diffstat (limited to 'arch/i386/kernel/time.c')
| -rw-r--r-- | arch/i386/kernel/time.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/i386/kernel/time.c b/arch/i386/kernel/time.c index e68d9fdb075..2854c357377 100644 --- 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); |