Merge branches 'release', 'cpuidle-2.6.25' and 'idle' into release

2008-02-07 03:11:05 -05:00
parent c64768a7d6 f757397097 9a0b841586
commit acf63867ae
6 changed files with 111 additions and 18 deletions
--- a/include/acpi/processor.h
+++ b/include/acpi/processor.h
@@ -34,6 +34,7 @@

 #define ACPI_CSTATE_SYSTEMIO	(0)
 #define ACPI_CSTATE_FFH		(1)
+#define ACPI_CSTATE_HALT	(2)

 /* Power Management */

@@ -64,7 +65,7 @@ struct acpi_processor_cx {
 	u8 valid;
 	u8 type;
 	u32 address;
-	u8 space_id;
+	u8 entry_method;
 	u8 index;
 	u32 latency;
 	u32 latency_ticks;