diff options
author | Len Brown <len.brown@intel.com> | 2010-10-26 14:51:00 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2010-10-26 14:51:00 -0400 |
commit | 7e31842441776b4d6ec7fd916c91663ad05b7814 (patch) | |
tree | 8d97d41b4f6861dcbc0dc3ac96fab7afddbed731 /drivers/acpi/sleep.h | |
parent | 1bd64d42abdd4f9d44f77011a31f0292112f4c3b (diff) | |
parent | b1d248d96c71665c79befb81207f38f894c7c082 (diff) |
Merge branch 'misc' into release
Diffstat (limited to 'drivers/acpi/sleep.h')
-rw-r--r-- | drivers/acpi/sleep.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/acpi/sleep.h b/drivers/acpi/sleep.h index d8821805c3b..74d59c8f467 100644 --- a/drivers/acpi/sleep.h +++ b/drivers/acpi/sleep.h @@ -1,5 +1,4 @@ -extern u8 sleep_states[]; extern int acpi_suspend(u32 state); extern void acpi_enable_wakeup_devices(u8 sleep_state); |