summaryrefslogtreecommitdiff
path: root/drivers/acpi/sleep.c
AgeCommit message (Collapse)AuthorFilesLines
2009-02-07Merge branches 'release', 'asus', 'bugzilla-12450', 'cpuidle', 'debug', ↵Len Brown1-26/+27
'ec', 'misc', 'printk' and 'processor' into release
2009-02-07ACPI: add missing KERN_* constants to printksFrank Seidel1-1/+1
According to kerneljanitors todo list all printk calls (beginning a new line) should have an according KERN_* constant. Those are the missing peaces here for the acpi subsystem. Signed-off-by: Frank Seidel <frank@f-seidel.de> Signed-off-by: Len Brown <len.brown@intel.com>
2009-01-17ACPI suspend: Fix compilation warnings in drivers/acpi/sleep.cRafael J. Wysocki1-25/+26
Fix two compilation warnings in drivers/acpi/sleep.c, one triggered by unsetting CONFIG_SUSPEND and the other triggered by unsetting CONFIG_HIBERNATION, by moving some code under the appropriate #ifdefs . Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> Signed-off-by: Len Brown <len.brown@intel.com>
2009-01-16ACPI: rename main.c to sleep.cLen Brown1-0/+747
Signed-off-by: Len Brown <len.brown@intel.com>