diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-24 20:08:56 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-24 20:08:56 -0400 |
| commit | 5f8fe4270e53d38421ba34c428c3b58933b48e50 (patch) | |
| tree | 2148a3ba1ec842d0d0ad8f3e3eb209eb6eba673d /drivers/serial/crisv10.c | |
| parent | d9fbd9a2cd5ac1b286a7d7cdb1a180ce1edaee2f (diff) | |
| parent | 24924ece4482d5466ffcd0affedce63816c88e53 (diff) | |
Merge branch 'for-linus' of git://repo.or.cz/cris-mirror
* 'for-linus' of git://repo.or.cz/cris-mirror:
CRIS: Cleanup linker script using new linker script macros.
ARRAY_SIZE changes
CRIS: convert to asm-generic/hardirq.h
CRISv10: Don't autonegotiate if autonegotiation is off
CRIS: fix defconfig build failure
CRIS: add pgprot_noncached
Diffstat (limited to 'drivers/serial/crisv10.c')
| -rw-r--r-- | drivers/serial/crisv10.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/serial/crisv10.c b/drivers/serial/crisv10.c index 7be52fe288eb..31f172397af3 100644 --- a/drivers/serial/crisv10.c +++ b/drivers/serial/crisv10.c | |||
| @@ -18,6 +18,7 @@ static char *serial_version = "$Revision: 1.25 $"; | |||
| 18 | #include <linux/tty.h> | 18 | #include <linux/tty.h> |
| 19 | #include <linux/tty_flip.h> | 19 | #include <linux/tty_flip.h> |
| 20 | #include <linux/major.h> | 20 | #include <linux/major.h> |
| 21 | #include <linux/smp_lock.h> | ||
| 21 | #include <linux/string.h> | 22 | #include <linux/string.h> |
| 22 | #include <linux/fcntl.h> | 23 | #include <linux/fcntl.h> |
| 23 | #include <linux/mm.h> | 24 | #include <linux/mm.h> |