diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/char/hvcs.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/char/hvcs.c')
| -rw-r--r-- | drivers/char/hvcs.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/char/hvcs.c b/drivers/char/hvcs.c index 266b858b8f85..bedc6c1b6fa5 100644 --- a/drivers/char/hvcs.c +++ b/drivers/char/hvcs.c | |||
| @@ -74,6 +74,7 @@ | |||
| 74 | #include <linux/module.h> | 74 | #include <linux/module.h> |
| 75 | #include <linux/moduleparam.h> | 75 | #include <linux/moduleparam.h> |
| 76 | #include <linux/sched.h> | 76 | #include <linux/sched.h> |
| 77 | #include <linux/slab.h> | ||
| 77 | #include <linux/spinlock.h> | 78 | #include <linux/spinlock.h> |
| 78 | #include <linux/stat.h> | 79 | #include <linux/stat.h> |
| 79 | #include <linux/tty.h> | 80 | #include <linux/tty.h> |