git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'hid-suspend' into picolcd
[pandora-kernel.git]
/
drivers
/
char
/
mmtimer.c
diff --git
a/drivers/char/mmtimer.c
b/drivers/char/mmtimer.c
index
918711a
..
ea7c99f
100644
(file)
--- a/
drivers/char/mmtimer.c
+++ b/
drivers/char/mmtimer.c
@@
-33,6
+33,7
@@
#include <linux/time.h>
#include <linux/math64.h>
#include <linux/smp_lock.h>
#include <linux/time.h>
#include <linux/math64.h>
#include <linux/smp_lock.h>
+#include <linux/slab.h>
#include <asm/uaccess.h>
#include <asm/sn/addrs.h>
#include <asm/uaccess.h>
#include <asm/sn/addrs.h>
@@
-546,7
+547,7
@@
static void mmtimer_tasklet(unsigned long data)
{
int nodeid = data;
struct mmtimer_node *mn = &timers[nodeid];
{
int nodeid = data;
struct mmtimer_node *mn = &timers[nodeid];
- struct mmtimer *x
= rb_entry(mn->next, struct mmtimer, list)
;
+ struct mmtimer *x;
struct k_itimer *t;
unsigned long flags;
struct k_itimer *t;
unsigned long flags;