diff options
| author | Dave Jones <davej@redhat.com> | 2005-08-17 22:56:07 -0700 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2005-08-17 22:56:07 -0700 |
| commit | a8b3e6f10f08f66ae1072efd087b30966a3654f6 (patch) | |
| tree | 1d1409855f8ad5beabafe061c6453edd84ba94c8 /drivers/ide/legacy/hd.c | |
| parent | 46acac3b4fd8ef66eec63b51de8d556a17c7d4f7 (diff) | |
| parent | 099d44e869f1886b5eb02a5145ca97b5e4142e28 (diff) | |
Merge /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/ide/legacy/hd.c')
| -rw-r--r-- | drivers/ide/legacy/hd.c | 4 |
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; |