diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-24 17:08:56 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-24 17:08:56 -0700 |
| commit | 5f8fe4270e53d38421ba34c428c3b58933b48e50 (patch) | |
| tree | 2148a3ba1ec842d0d0ad8f3e3eb209eb6eba673d /drivers/serial | |
| parent | Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm (diff) | |
| parent | CRIS: Cleanup linker script using new linker script macros. (diff) | |
| download | linux-dev-5f8fe4270e53d38421ba34c428c3b58933b48e50.tar.xz linux-dev-5f8fe4270e53d38421ba34c428c3b58933b48e50.zip | |
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')
| -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 $"; #include <linux/tty.h> #include <linux/tty_flip.h> #include <linux/major.h> +#include <linux/smp_lock.h> #include <linux/string.h> #include <linux/fcntl.h> #include <linux/mm.h> |