projects
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5866d7e
)
CRIS: Fasttimer: Remove obsolete ifdef
author
Jesper Nilsson
<jesper.nilsson@axis.com>
Mon, 2 Aug 2010 13:19:17 +0000
(15:19 +0200)
committer
Jesper Nilsson
<jesper.nilsson@axis.com>
Wed, 4 Aug 2010 10:59:42 +0000
(12:59 +0200)
Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
arch/cris/arch-v10/kernel/fasttimer.c
patch
|
blob
|
history
diff --git
a/arch/cris/arch-v10/kernel/fasttimer.c
b/arch/cris/arch-v10/kernel/fasttimer.c
index 5ff08a8695e9705f597358d9f0cf51b0ba22962c..8a8196ee8ce88f5966694c570be8556c577c17b6 100644
(file)
--- 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);
}