diff --git a/[refs] b/[refs] index 1df945a890ad..a924ab74f201 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8ae48363ee2134141c0c661a57be213fc5d98cee +refs/heads/master: 233aa49b8c1cb9276ca4316c61e324f697a19ce2 diff --git a/trunk/drivers/staging/olpc_dcon/olpc_dcon.c b/trunk/drivers/staging/olpc_dcon/olpc_dcon.c index 808273db773c..287085f32bf0 100644 --- a/trunk/drivers/staging/olpc_dcon/olpc_dcon.c +++ b/trunk/drivers/staging/olpc_dcon/olpc_dcon.c @@ -214,12 +214,6 @@ static int dcon_bus_stabilize(struct i2c_client *client, int is_powered_down) return 0; } - -/* Backlight notes - turning off the backlight enable bit in the DCON - * doesn't save us any power over just pushing the BL to zero, so we - * don't use that bit in this code. - */ - static int dcon_get_backlight(void) { if (dcon_client == NULL)