Merge branch 'bjorn-initcall-cleanup' into release

2009-04-05 01:38:31 -04:00
parent 67dc092187 018f452e9d
commit 9a38f4eec5
13 changed files with 80 additions and 82 deletions
--- a/drivers/acpi/sleep.c
+++ b/drivers/acpi/sleep.c
@@ -21,6 +21,8 @@

 #include <acpi/acpi_bus.h>
 #include <acpi/acpi_drivers.h>
+
+#include "internal.h"
 #include "sleep.h"

 u8 sleep_states[ACPI_S_STATE_COUNT];