diff options
author | Ralf Baechle <ralf@linux-mips.org> | 1999-06-17 13:25:08 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 1999-06-17 13:25:08 +0000 |
commit | 59223edaa18759982db0a8aced0e77457d10c68e (patch) | |
tree | 89354903b01fa0a447bffeefe00df3044495db2e /arch/m68k/atari | |
parent | db7d4daea91e105e3859cf461d7e53b9b77454b2 (diff) |
Merge with Linux 2.3.6. Sorry, this isn't tested on silicon, I don't
have a MIPS box at hand.
Diffstat (limited to 'arch/m68k/atari')
-rw-r--r-- | arch/m68k/atari/stdma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/atari/stdma.c b/arch/m68k/atari/stdma.c index 5e2090f8f..205837ef6 100644 --- a/arch/m68k/atari/stdma.c +++ b/arch/m68k/atari/stdma.c @@ -43,7 +43,7 @@ static int stdma_locked = 0; /* the semaphore */ /* int func to be called */ static void (*stdma_isr)(int, void *, struct pt_regs *) = NULL; static void *stdma_isr_data = NULL; /* data passed to isr */ -static struct wait_queue *stdma_wait = NULL; /* wait queue for ST-DMA */ +static DECLARE_WAIT_QUEUE_HEAD(stdma_wait); /* wait queue for ST-DMA */ |