summaryrefslogtreecommitdiffstats
path: root/arch/sparc/ap1000
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1999-06-17 13:25:08 +0000
committerRalf Baechle <ralf@linux-mips.org>1999-06-17 13:25:08 +0000
commit59223edaa18759982db0a8aced0e77457d10c68e (patch)
tree89354903b01fa0a447bffeefe00df3044495db2e /arch/sparc/ap1000
parentdb7d4daea91e105e3859cf461d7e53b9b77454b2 (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/sparc/ap1000')
-rw-r--r--arch/sparc/ap1000/util.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/ap1000/util.c b/arch/sparc/ap1000/util.c
index 079c9f4c0..1fe23dc41 100644
--- a/arch/sparc/ap1000/util.c
+++ b/arch/sparc/ap1000/util.c
@@ -355,7 +355,7 @@ void ap_exit_irq(int irq)
}
-static struct wait_queue *timer_wait = NULL;
+static DECLARE_WAIT_QUEUE_HEAD(timer_wait);
static void wait_callback(unsigned long _ignored)
{