diff options
author | John W. Linville <linville@tuxdriver.com> | 2006-05-17 14:51:24 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2006-05-17 14:51:24 -0400 |
commit | 5dd8816aeb1f068ade0349a22009ff7a66f25413 (patch) | |
tree | c56ff327b1dfa8868b4208aea9ac4158e3bfe308 /drivers/char/rio/rioboot.c | |
parent | f03cc4fd927357bd4b3cea1a053b9f9d8f1731cc (diff) | |
parent | 0c056c50a6218e0e577817c16ba8851af593d742 (diff) |
Merge branch 'from-linus' into upstream
Diffstat (limited to 'drivers/char/rio/rioboot.c')
-rw-r--r-- | drivers/char/rio/rioboot.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/char/rio/rioboot.c b/drivers/char/rio/rioboot.c index acda9326c2ef..290143addd34 100644 --- a/drivers/char/rio/rioboot.c +++ b/drivers/char/rio/rioboot.c | |||
@@ -34,6 +34,7 @@ | |||
34 | #include <linux/slab.h> | 34 | #include <linux/slab.h> |
35 | #include <linux/termios.h> | 35 | #include <linux/termios.h> |
36 | #include <linux/serial.h> | 36 | #include <linux/serial.h> |
37 | #include <linux/vmalloc.h> | ||
37 | #include <asm/semaphore.h> | 38 | #include <asm/semaphore.h> |
38 | #include <linux/generic_serial.h> | 39 | #include <linux/generic_serial.h> |
39 | #include <linux/errno.h> | 40 | #include <linux/errno.h> |