summaryrefslogtreecommitdiffstats
path: root/arch/cris
diff options
context:
space:
mode:
authorJesper Nilsson <jesper.nilsson@axis.com>2010-08-02 15:19:17 +0200
committerJesper Nilsson <jesper.nilsson@axis.com>2010-08-04 12:59:42 +0200
commitd77eab8cb18dc4b8adfa82088e95b48c654c66b9 (patch)
treec512a06d7f2894a4ab0a3cad2b6901866b3aef7c /arch/cris
parentCRIS: Better link to rs485 in help (diff)
downloadlinux-d77eab8cb18dc4b8adfa82088e95b48c654c66b9.tar.xz
linux-d77eab8cb18dc4b8adfa82088e95b48c654c66b9.zip
CRIS: Fasttimer: Remove obsolete ifdef
Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
Diffstat (limited to 'arch/cris')
-rw-r--r--arch/cris/arch-v10/kernel/fasttimer.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/cris/arch-v10/kernel/fasttimer.c b/arch/cris/arch-v10/kernel/fasttimer.c
index 5ff08a8695e9..8a8196ee8ce8 100644
--- a/arch/cris/arch-v10/kernel/fasttimer.c
+++ b/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);
}