Merge branch 'spi/merge' of git://git.secretlab.ca/git/linux-2.6

[~andy/linux] / arch / um / include / shared / line.h

diff --git a/arch/um/include/shared/line.h b/arch/um/include/shared/line.h
index 72f4f25af2478e5c4d14d0a3072a45d10f21a211..63df3ca02ac2fbc5c367afaeeaec26010f8b55c0 100644 (file)
--- 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;