diff options
| author | Steve French <sfrench@us.ibm.com> | 2009-07-16 00:21:39 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2009-07-16 00:21:39 -0400 |
| commit | f6c43385435640e056424034caac0d765c45e370 (patch) | |
| tree | 54c2ba0a7d3abb156bc51f6b9f02e00f0a260f85 /drivers/char/cyclades.c | |
| parent | 65bc98b0059360e458aebd208587be44641227c1 (diff) | |
| parent | 35b5c55fee08e6e4001ba98060a2d0b82f70b5f4 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/char/cyclades.c')
| -rw-r--r-- | drivers/char/cyclades.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/char/cyclades.c b/drivers/char/cyclades.c index f3366d3f06cf..2dafc2da0648 100644 --- a/drivers/char/cyclades.c +++ b/drivers/char/cyclades.c | |||
| @@ -633,6 +633,7 @@ | |||
| 633 | #include <linux/tty.h> | 633 | #include <linux/tty.h> |
| 634 | #include <linux/tty_flip.h> | 634 | #include <linux/tty_flip.h> |
| 635 | #include <linux/serial.h> | 635 | #include <linux/serial.h> |
| 636 | #include <linux/smp_lock.h> | ||
| 636 | #include <linux/major.h> | 637 | #include <linux/major.h> |
| 637 | #include <linux/string.h> | 638 | #include <linux/string.h> |
| 638 | #include <linux/fcntl.h> | 639 | #include <linux/fcntl.h> |