diff options
author | Olof Johansson <olof@lixom.net> | 2014-05-20 01:06:02 -0400 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2014-05-20 01:06:36 -0400 |
commit | 9e05f9f300828aecb84659cedc6399b7a76683ef (patch) | |
tree | c335cb4d73c1b6f222fa855756c7096b7f1308e3 /include/linux/tty.h | |
parent | a501fd37f77a703a8710af8f6964e0ae269df973 (diff) | |
parent | c7cff54d5926e3f419c23eff2ebaf6f5e12da05d (diff) |
Merge tag 'sirf-soc-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/baohua/linux into next/cleanup
Merge "ARM: sirf: machine update for 3.16" from Barry Song:
Most of them fix some minor checkpatch issues according to key customers'
requirement. And this patchset also cleanups the clk of clocksource: move
to get clk by dts properity.
* tag 'sirf-soc-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/baohua/linux:
clocksource:sirf: remove the hardcode for the clk of timers
irqchip: sirf: fix one minor checkpatch issue
clocksource: prima2: fix some minor checkpatch issues
ARM: prima2: rstc: fix some minor checkpatch issues
+ Linux 3.15-rc3
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'include/linux/tty.h')
-rw-r--r-- | include/linux/tty.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/tty.h b/include/linux/tty.h index 1c3316a47d7e..036cccd80d9f 100644 --- a/include/linux/tty.h +++ b/include/linux/tty.h | |||
@@ -61,6 +61,7 @@ struct tty_bufhead { | |||
61 | struct tty_buffer *head; /* Queue head */ | 61 | struct tty_buffer *head; /* Queue head */ |
62 | struct work_struct work; | 62 | struct work_struct work; |
63 | struct mutex lock; | 63 | struct mutex lock; |
64 | spinlock_t flush_lock; | ||
64 | atomic_t priority; | 65 | atomic_t priority; |
65 | struct tty_buffer sentinel; | 66 | struct tty_buffer sentinel; |
66 | struct llist_head free; /* Free queue head */ | 67 | struct llist_head free; /* Free queue head */ |