diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-03-23 07:59:38 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-03-23 07:59:38 +0100 |
| commit | baca54d956f77be9abc487bcdddf7a2a1fbbda1b (patch) | |
| tree | 4dbd646d7f533c2c741ecb428563a84f5af8ceec /drivers/auxdisplay/charlcd.c | |
| parent | 217fb361167d4e108b9076e826a6d9624252696a (diff) | |
| parent | 16fbf79b0f83bc752cee8589279f1ebfe57b3b6e (diff) | |
| download | lwn-baca54d956f77be9abc487bcdddf7a2a1fbbda1b.tar.gz lwn-baca54d956f77be9abc487bcdddf7a2a1fbbda1b.zip | |
Merge 5.6-rc7 into char-misc-next
We need the char/misc driver fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/auxdisplay/charlcd.c')
| -rw-r--r-- | drivers/auxdisplay/charlcd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/auxdisplay/charlcd.c b/drivers/auxdisplay/charlcd.c index e7048658cb5e..d58278ae9e4a 100644 --- a/drivers/auxdisplay/charlcd.c +++ b/drivers/auxdisplay/charlcd.c @@ -86,7 +86,7 @@ struct charlcd_priv { int len; } esc_seq; - unsigned long long drvdata[0]; + unsigned long long drvdata[]; }; #define charlcd_to_priv(p) container_of(p, struct charlcd_priv, lcd) |