Merge branch 'master' into for-next

[firefly-linux-kernel-4.4.55.git] / drivers / staging / olpc_dcon / olpc_dcon.c

diff --git a/drivers/staging/olpc_dcon/olpc_dcon.c b/drivers/staging/olpc_dcon/olpc_dcon.c
index 4ca45ec7fd84ef088e3258450e135fb7ccaacc72..309c0ed4ef8a30571e7999802819c26a12e0e394 100644 (file)
--- a/drivers/staging/olpc_dcon/olpc_dcon.c
+++ b/drivers/staging/olpc_dcon/olpc_dcon.c
@@ -615,7 +615,7 @@ static struct device_attribute dcon_device_files[] = {
        __ATTR(resumeline, 0644, dcon_resumeline_show, dcon_resumeline_store),
 };
 
-static struct backlight_ops dcon_bl_ops = {
+static const struct backlight_ops dcon_bl_ops = {
        .get_brightness = dconbl_get,
        .update_status = dconbl_set
 };