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

Merge branch 'misc-2.6.35' into release

Browse Source
This commit is contained in:
Len Brown
2010-05-28 16:18:20 -04:00
parent 64a4222f7e 0dc698b93f
commit edbe77ba94
6 changed files with 29 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
include/acpi/processor.h
View File

@ -52,17 +52,6 @@ struct acpi_power_register {
u64 address;
} __attribute__ ((packed));
struct acpi_processor_cx_policy {
u32 count;
struct acpi_processor_cx *state;
struct {
u32 time;
u32 ticks;
u32 count;
u32 bm;
} threshold;
};
struct acpi_processor_cx {
u8 valid;
u8 type;
@ -74,8 +63,6 @@ struct acpi_processor_cx {
u32 power;
u32 usage;
u64 time;
struct acpi_processor_cx_policy promotion;
struct acpi_processor_cx_policy demotion;
char desc[ACPI_CX_DESC_LEN];
};