summaryrefslogtreecommitdiffstats
path: root/drivers/ide/legacy/hd.c
diff options
context:
space:
mode:
authorArtem B. Bityuckiy <dedekind@infradead.org>2005-07-06 16:43:18 +0200
committerThomas Gleixner <tglx@mtd.linutronix.de>2005-07-06 19:40:38 +0200
commitb3539219c9ea20ebf6a5ea3cc534f423a3607c41 (patch)
treed17c31c0eac0a7290ba5011b59a100fd9e9c9532 /drivers/ide/legacy/hd.c
parent[JFFS2] Simplify the tree insert code. (diff)
parentLinux v2.6.13-rc3 (diff)
downloadlinux-b3539219c9ea20ebf6a5ea3cc534f423a3607c41.tar.xz
linux-b3539219c9ea20ebf6a5ea3cc534f423a3607c41.zip
Merge with rsync://fileserver/linux
Update to 2.6.12-rc3
Diffstat (limited to 'drivers/ide/legacy/hd.c')
-rw-r--r--drivers/ide/legacy/hd.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/ide/legacy/hd.c b/drivers/ide/legacy/hd.c
index e884cd4b22fd..242029c9c0ca 100644
--- a/drivers/ide/legacy/hd.c
+++ b/drivers/ide/legacy/hd.c
@@ -156,11 +156,13 @@ else \
#if (HD_DELAY > 0)
+
+#include <asm/i8253.h>
+
unsigned long last_req;
unsigned long read_timer(void)
{
- extern spinlock_t i8253_lock;
unsigned long t, flags;
int i;