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 'linus' into timers/core
[pandora-kernel.git]
/
arch
/
um
/
drivers
/
line.c
diff --git
a/arch/um/drivers/line.c
b/arch/um/drivers/line.c
index
cf8a97f
..
7a656bd
100644
(file)
--- a/
arch/um/drivers/line.c
+++ b/
arch/um/drivers/line.c
@@
-6,6
+6,7
@@
#include "linux/irqreturn.h"
#include "linux/kd.h"
#include "linux/sched.h"
#include "linux/irqreturn.h"
#include "linux/kd.h"
#include "linux/sched.h"
+#include "linux/slab.h"
#include "chan_kern.h"
#include "irq_kern.h"
#include "irq_user.h"
#include "chan_kern.h"
#include "irq_kern.h"
#include "irq_user.h"
@@
-18,10
+19,10
@@
static irqreturn_t line_interrupt(int irq, void *data)
{
struct chan *chan = data;
struct line *line = chan->line;
{
struct chan *chan = data;
struct line *line = chan->line;
- struct tty_struct *tty
= line->tty
;
+ struct tty_struct *tty;
if (line)
if (line)
- chan_interrupt(&line->chan_list, &line->task, tty, irq);
+ chan_interrupt(&line->chan_list, &line->task,
line->
tty, irq);
return IRQ_HANDLED;
}
return IRQ_HANDLED;
}