diff options
author | Len Brown <len.brown@intel.com> | 2010-06-02 04:53:36 +0200 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2010-06-02 04:53:36 +0200 |
commit | b42f5b0f0fd8c1c442c1b29a3fbcb338e8bd7732 (patch) | |
tree | 194e13dfa85d2d2af8bd125acd80a445ee0def62 /drivers/acpi/power.c | |
parent | ACPI / EC / PM: Fix names of functions that block/unblock EC transactions (diff) | |
parent | ACPI: update feature-removal.txt to reflect deleted acpi=ht option (diff) | |
download | linux-b42f5b0f0fd8c1c442c1b29a3fbcb338e8bd7732.tar.xz linux-b42f5b0f0fd8c1c442c1b29a3fbcb338e8bd7732.zip |
Merge branches 'bugzilla-14668' and 'misc-2.6.35' into release
Diffstat (limited to 'drivers/acpi/power.c')
-rw-r--r-- | drivers/acpi/power.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c index ddc76787b842..f74d3b31e5c9 100644 --- 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++) { /* |