Merge branch 'for-39-rc4' of git://codeaurora.org/quic/kernel/davidb/linux-msm

[firefly-linux-kernel-4.4.55.git] / include / linux / tty.h

diff --git a/include/linux/tty.h b/include/linux/tty.h
index 4e53d4641b388c965903af977d33b53f5fb1e20b..9f469c700550e79dc7fc3949e34c94096c2078ff 100644 (file)
--- a/include/linux/tty.h
+++ b/include/linux/tty.h
@@ -82,7 +82,7 @@ struct tty_buffer {
 
 
 struct tty_bufhead {
-       struct delayed_work work;
+       struct work_struct work;
        spinlock_t lock;
        struct tty_buffer *head;        /* Queue head */
        struct tty_buffer *tail;        /* Active buffer */