diff options
| author | Dave Jones <davej@tetrachloride.(none)> | 2002-12-29 10:04:08 -0100 |
|---|---|---|
| committer | Dave Jones <davej@tetrachloride.(none)> | 2002-12-29 10:04:08 -0100 |
| commit | 20b2d4006542bdb0673c3c2ebcf83d7b69a75104 (patch) | |
| tree | aac41b6f802abff56051f9208995ea2c1c682aad /include/linux/ide.h | |
| parent | 7d255ace78aea45470605bec357098280f885147 (diff) | |
| parent | 0e3a6c7d8bfc8a1b3d947334b74154ca341dc51b (diff) | |
Merge tetrachloride.(none):/mnt/stuff/kernel/2.5/bk-linus
into tetrachloride.(none):/mnt/stuff/kernel/2.5/agpgart
Diffstat (limited to 'include/linux/ide.h')
| -rw-r--r-- | include/linux/ide.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/ide.h b/include/linux/ide.h index 033e94a6d6e4..2e2718ebfd98 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h @@ -360,8 +360,8 @@ extern int ide_irq_lock; /* Currently only Atari needs it */ #ifndef IDE_ARCH_LOCK -# define ide_release_lock(lock) do {} while (0) -# define ide_get_lock(lock, hdlr, data) do {} while (0) +# define ide_release_lock() do {} while (0) +# define ide_get_lock(hdlr, data) do {} while (0) #endif /* IDE_ARCH_LOCK */ /* |