diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-05-11 09:00:09 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-05-11 09:00:09 +0200 |
| commit | c8be6af9ef16cf44d690fc227a0d2dd7a526ef05 (patch) | |
| tree | 805518819810a3ab4f1c53dc8d529f987abe9db8 /include/linux/tty.h | |
| parent | c78c31b374a68be79cb4a03ef5b6c187f034e903 (diff) | |
| parent | 2ef96a5bb12be62ef75b5828c0aab838ebb29cb8 (diff) | |
Merge v5.7-rc5 into driver-core-next
We want the driver core fixes in here and this resolves a merge issue
with drivers/base/dd.c
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/tty.h')
| -rw-r--r-- | include/linux/tty.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/tty.h b/include/linux/tty.h index bd5fe0e907e8..a99e9b8e4e31 100644 --- a/include/linux/tty.h +++ b/include/linux/tty.h @@ -66,7 +66,7 @@ struct tty_buffer { int read; int flags; /* Data points here */ - unsigned long data[0]; + unsigned long data[]; }; /* Values for .flags field of tty_buffer */ |