From b86d0a4d3dbefaea1e14ba16bd045275482c7fe9 Mon Sep 17 00:00:00 2001 From: Jesper Nilsson Date: Mon, 2 Aug 2010 15:19:17 +0200 Subject: [PATCH] --- yaml --- r: 207120 b: refs/heads/master c: d77eab8cb18dc4b8adfa82088e95b48c654c66b9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/cris/arch-v10/kernel/fasttimer.c | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 9e0855f386fc..f0077fef92d3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5866d7ef9553c0107576dc1bc1d5c6acb68e8f87 +refs/heads/master: d77eab8cb18dc4b8adfa82088e95b48c654c66b9 diff --git a/trunk/arch/cris/arch-v10/kernel/fasttimer.c b/trunk/arch/cris/arch-v10/kernel/fasttimer.c index 5ff08a8695e9..8a8196ee8ce8 100644 --- a/trunk/arch/cris/arch-v10/kernel/fasttimer.c +++ b/trunk/arch/cris/arch-v10/kernel/fasttimer.c @@ -467,11 +467,7 @@ timer1_handler(int irq, void *dev_id) static void wake_up_func(unsigned long data) { -#ifdef DECLARE_WAITQUEUE - wait_queue_head_t *sleep_wait_p = (wait_queue_head_t*)data; -#else - struct wait_queue **sleep_wait_p = (struct wait_queue **)data; -#endif + wait_queue_head_t *sleep_wait_p = (wait_queue_head_t *)data; wake_up(sleep_wait_p); }