lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'sfi-base' into release

Browse Source 
Conflicts:
	drivers/acpi/power.c

Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
Len Brown
2009-09-19 00:37:13 -04:00
parent 71fd68e7d2 e55a5999ff
commit 003d6a38ce
37 changed files with 96 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/acpi/power.c
View File

@@ -43,9 +43,10 @@
#include <linux/seq_file.h>
#include <acpi/acpi_bus.h>
#include <acpi/acpi_drivers.h>
#include "sleep.h"
#define PREFIX "ACPI: "
#define _COMPONENT ACPI_POWER_COMPONENT
ACPI_MODULE_NAME("power");
#define ACPI_POWER_CLASS "power_resource"