Merge branch 'master' into for-next

[karo-tx-linux.git] / drivers / acpi / power.c

diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c
index ddc76787b8424f1a11d50ef0f7810b920ad05ef9..f74d3b31e5c973cf61b98dbd985611be5fe7eec9 100644 (file)
--- a/drivers/acpi/power.c
+++ b/drivers/acpi/power.c
@@ -172,7 +172,6 @@ static int acpi_power_get_list_state(struct acpi_handle_list *list, int *state)
                return -EINVAL;
 
        /* The state of the list is 'on' IFF all resources are 'on'. */
-       /* */
 
        for (i = 0; i < list->count; i++) {
                /*