diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-22 14:15:33 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-22 14:15:33 -0400 |
| commit | 36c48f8cc5fc0558c1109a84b0832a26c384d8f1 (patch) | |
| tree | d88904ac2960e3d7498cfeed25145834cb7a62fd /arch/um/drivers/line.c | |
| parent | 1482338f6242dbaea46039c5f1b4604a472b364b (diff) | |
| parent | 7f3c1fa4c3f52ef65005ae5162e5173e875b8c0c (diff) | |
Merge branch 'slabh' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc
* 'slabh' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc:
uml: Fix build breakage after slab.h changes
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" |