Merge drm/drm-next into drm-misc-next

[sfrench/cifs-2.6.git] / drivers / gpu / drm / meson / meson_drv.c

diff --git a/drivers/gpu/drm/meson/meson_drv.c b/drivers/gpu/drm/meson/meson_drv.c
index edae79f411539be6acb5d319bdd3220d1930b564..1b70938cfd2c43b327cc3df086a57a7efc8d07e4 100644 (file)
--- a/drivers/gpu/drm/meson/meson_drv.c
+++ b/drivers/gpu/drm/meson/meson_drv.c
@@ -168,7 +168,7 @@ static const struct meson_drm_soc_attr meson_drm_soc_attrs[] = {
                },
                .attrs = (const struct soc_device_attribute []) {
                        { .soc_id = "GXL (S805*)", },
-                       { /* sentinel */ },
+                       { /* sentinel */ }
                }
        },
 };