diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-03-28 08:54:25 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-03-28 08:54:25 +0200 |
| commit | 4a96d1a5f0c51a0c991fb47160eca305ba628110 (patch) | |
| tree | 42a33c4a256f6353256e7a5b0edc4285d0a65901 /drivers/auxdisplay/img-ascii-lcd.c | |
| parent | 5204bf17031b69fa5faa4dc80a9dc1e2446d74f9 (diff) | |
| parent | cc66afea58f858ff6da7f79b8a595a67bbb4f9a9 (diff) | |
Merge branch 'ras/urgent' into ras/core, to pick up fix
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/auxdisplay/img-ascii-lcd.c')
| -rw-r--r-- | drivers/auxdisplay/img-ascii-lcd.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/auxdisplay/img-ascii-lcd.c b/drivers/auxdisplay/img-ascii-lcd.c index bf43b5d2aafc..83f1439e57fd 100644 --- a/drivers/auxdisplay/img-ascii-lcd.c +++ b/drivers/auxdisplay/img-ascii-lcd.c @@ -218,6 +218,7 @@ static const struct of_device_id img_ascii_lcd_matches[] = { { .compatible = "img,boston-lcd", .data = &boston_config }, { .compatible = "mti,malta-lcd", .data = &malta_config }, { .compatible = "mti,sead3-lcd", .data = &sead3_config }, + { /* sentinel */ } }; /** |