diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-10-17 11:22:50 (GMT) |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-17 11:22:50 (GMT) |
commit | 8eb41582d2106eccc7717047d1184481f5a1b3a6 (patch) | |
tree | 12257bbe39b5c8ae6918198fde682ed0aacd8e00 /arch/um/include/shared/line.h | |
parent | 127d4eb97b7bebc15fd692603263e75c220e24f9 (diff) | |
parent | 1cb17e2dbd09436069733500ea48e0c9b1f0a1cc (diff) | |
download | linux-8eb41582d2106eccc7717047d1184481f5a1b3a6.tar.xz |
Merge branch 'ep93xx/board' into next/board
Diffstat (limited to 'arch/um/include/shared/line.h')
-rw-r--r-- | arch/um/include/shared/line.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/um/include/shared/line.h b/arch/um/include/shared/line.h index 72f4f25..63df3ca 100644 --- a/arch/um/include/shared/line.h +++ b/arch/um/include/shared/line.h @@ -33,6 +33,7 @@ struct line_driver { struct line { struct tty_struct *tty; spinlock_t count_lock; + unsigned long count; int valid; char *init_str; |