From: Jesper Nilsson <jesper.nilsson@axis.com>
Date: Mon, 2 Aug 2010 13:19:17 +0000 (+0200)
Subject: CRIS: Fasttimer: Remove obsolete ifdef
X-Git-Tag: v2.6.36-rc1~484^2~40
X-Git-Url: http://bbs.cooldavid.org/git/?a=commitdiff_plain;h=d77eab8cb18dc4b8adfa82088e95b48c654c66b9;p=net-next-2.6.git

CRIS: Fasttimer: Remove obsolete ifdef

Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
---

diff --git a/arch/cris/arch-v10/kernel/fasttimer.c b/arch/cris/arch-v10/kernel/fasttimer.c
index 5ff08a8695e..8a8196ee8ce 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);
 }