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 0f30c3c1eea475b7e2c0bb247981903ba6e006b3..f74d3b31e5c973cf61b98dbd985611be5fe7eec9 100644 (file)
--- a/drivers/acpi/power.c
+++ b/drivers/acpi/power.c
@@ -39,6 +39,7 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/types.h>
+#include <linux/slab.h>
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
 #include <acpi/acpi_bus.h>
@@ -171,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++) {
                /*