diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2010-04-29 03:36:24 -0400 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2010-04-29 03:36:24 -0400 |
| commit | 7407cf355fdf5500430be966dbbde84a27293bad (patch) | |
| tree | 922861288ff38558ed721a79653f52b17b13bb95 /arch/um/drivers/line.c | |
| parent | 6a47dc1418682c83d603b491df1d048f73aa973e (diff) | |
| parent | 79dba2eaa771c3173957eccfd288e0e0d12e4d3f (diff) | |
Merge branch 'master' into for-2.6.35
Conflicts:
fs/block_dev.c
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'arch/um/drivers/line.c')
| -rw-r--r-- | arch/um/drivers/line.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/um/drivers/line.c b/arch/um/drivers/line.c index 64cda95f59ca..7a656bd8bd3c 100644 --- a/arch/um/drivers/line.c +++ b/arch/um/drivers/line.c | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | #include "linux/irqreturn.h" | 6 | #include "linux/irqreturn.h" |
| 7 | #include "linux/kd.h" | 7 | #include "linux/kd.h" |
| 8 | #include "linux/sched.h" | 8 | #include "linux/sched.h" |
| 9 | #include "linux/slab.h" | ||
| 9 | #include "chan_kern.h" | 10 | #include "chan_kern.h" |
| 10 | #include "irq_kern.h" | 11 | #include "irq_kern.h" |
| 11 | #include "irq_user.h" | 12 | #include "irq_user.h" |