diff options
| author | Olof Johansson <olof@lixom.net> | 2014-05-29 13:39:43 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-05-29 13:39:43 -0700 |
| commit | 8320857b1d168fd17d7cee48bbfd04aaf6797be8 (patch) | |
| tree | 58b31d3d9514df93974216f190824d73f9816d9f /include/linux/tty.h | |
| parent | 263c08af44741697202b85e631a964ee85200eb0 (diff) | |
| parent | 4b660a7f5c8099d88d1a43d8ae138965112592c7 (diff) | |
Merge tag 'v3.15-rc6' into next/defconfig
Linux 3.15-rc6
Diffstat (limited to 'include/linux/tty.h')
| -rw-r--r-- | include/linux/tty.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/tty.h b/include/linux/tty.h index 036cccd80d9f..1c3316a47d7e 100644 --- a/include/linux/tty.h +++ b/include/linux/tty.h @@ -61,7 +61,6 @@ struct tty_bufhead { struct tty_buffer *head; /* Queue head */ struct work_struct work; struct mutex lock; - spinlock_t flush_lock; atomic_t priority; struct tty_buffer sentinel; struct llist_head free; /* Free queue head */ |