diff options
| author | James Morris <jmorris@macbook.(none)> | 2009-12-03 01:33:40 -0500 |
|---|---|---|
| committer | James Morris <jmorris@macbook.(none)> | 2009-12-03 01:33:40 -0500 |
| commit | c84d6efd363a3948eb32ec40d46bab6338580454 (patch) | |
| tree | 3ba7ac46e6626fe8ac843834588609eb6ccee5c6 /drivers/char/nozomi.c | |
| parent | 7539cf4b92be4aecc573ea962135f246a7a33401 (diff) | |
| parent | 22763c5cf3690a681551162c15d34d935308c8d7 (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'drivers/char/nozomi.c')
| -rw-r--r-- | drivers/char/nozomi.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/char/nozomi.c b/drivers/char/nozomi.c index ec58d8c387ff..d3400b20444f 100644 --- a/drivers/char/nozomi.c +++ b/drivers/char/nozomi.c | |||
| @@ -48,6 +48,7 @@ | |||
| 48 | #include <linux/tty.h> | 48 | #include <linux/tty.h> |
| 49 | #include <linux/tty_driver.h> | 49 | #include <linux/tty_driver.h> |
| 50 | #include <linux/tty_flip.h> | 50 | #include <linux/tty_flip.h> |
| 51 | #include <linux/sched.h> | ||
| 51 | #include <linux/serial.h> | 52 | #include <linux/serial.h> |
| 52 | #include <linux/interrupt.h> | 53 | #include <linux/interrupt.h> |
| 53 | #include <linux/kmod.h> | 54 | #include <linux/kmod.h> |