diff options
| author | Tom Rini <trini@konsulko.com> | 2020-04-10 18:28:20 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-04-10 18:28:20 -0400 |
| commit | 1390c400846cf44b70f095ffd71306244f4cde0a (patch) | |
| tree | 79854db9d397131a6614e71a8a51a1edb00bf4df /drivers/video | |
| parent | 587e4a4296982f85b2a40fc8a704db65079e0aac (diff) | |
| parent | ddd4d99247182a8ec3f86c8cf8099f0f138f319e (diff) | |
Merge branch '2020-04-10-gitlab-travis-gcc9' into next
- Switch over to using GCC-9.2.0 in our Azure, GitLab and Travis-CI
instances
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/sunxi/sunxi_display.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/sunxi/sunxi_display.c b/drivers/video/sunxi/sunxi_display.c index 31f0aa7ddc..4e1720ef7e 100644 --- a/drivers/video/sunxi/sunxi_display.c +++ b/drivers/video/sunxi/sunxi_display.c @@ -1014,7 +1014,6 @@ static void sunxi_mode_set(const struct ctfb_res_modes *mode, static const char *sunxi_get_mon_desc(enum sunxi_monitor monitor) { switch (monitor) { - case sunxi_monitor_none: return "none"; case sunxi_monitor_dvi: return "dvi"; case sunxi_monitor_hdmi: return "hdmi"; case sunxi_monitor_lcd: return "lcd"; @@ -1023,8 +1022,9 @@ static const char *sunxi_get_mon_desc(enum sunxi_monitor monitor) case sunxi_monitor_composite_ntsc: return "composite-ntsc"; case sunxi_monitor_composite_pal_m: return "composite-pal-m"; case sunxi_monitor_composite_pal_nc: return "composite-pal-nc"; + case sunxi_monitor_none: /* fall through */ + default: return "none"; } - return NULL; /* never reached */ } ulong board_get_usable_ram_top(ulong total_size) |