From 7f48c5558fa1f8b1c249f5e1a0b354c163bcbc59 Mon Sep 17 00:00:00 2001
From: Daniel Lezcano <daniel.lezcano@linaro.org>
Date: Wed, 5 Sep 2012 15:13:48 +0200
Subject: [PATCH] --- yaml --- r: 328671 b: refs/heads/master c:
 c59687f8466df36633d937cc298aad465d704990 h: refs/heads/master i:   328669:
 7070a214438ee5f40e986394b9c2e4e5f7901995   328667:
 1d7e6952df30d2f618005fd63408a2cd4c80bdad   328663:
 22cd4b946481fb2aa5b7bdbbb8fc3bf7b423d341   328655:
 8ccc494dbac87c46afd88423783fadebd2a64bc6   328639:
 9c0cee6cb11a86954dd431f78c5bf06b0cc98fa2 v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/acpi/processor_idle.c    | 2 --
 trunk/drivers/xen/xen-acpi-processor.c | 1 -
 trunk/include/acpi/processor.h         | 1 -
 4 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index e059c52d9b2d..04dca44ee404 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 66804c13f7b79fb26cf4848ebac1e865b9aff65c
+refs/heads/master: c59687f8466df36633d937cc298aad465d704990
diff --git a/trunk/drivers/acpi/processor_idle.c b/trunk/drivers/acpi/processor_idle.c
index ad3730b4038b..de896242d144 100644
--- a/trunk/drivers/acpi/processor_idle.c
+++ b/trunk/drivers/acpi/processor_idle.c
@@ -483,8 +483,6 @@ static int acpi_processor_get_power_info_cst(struct acpi_processor *pr)
 		if (obj->type != ACPI_TYPE_INTEGER)
 			continue;
 
-		cx.power = obj->integer.value;
-
 		current_count++;
 		memcpy(&(pr->power.states[current_count]), &cx, sizeof(cx));
 
diff --git a/trunk/drivers/xen/xen-acpi-processor.c b/trunk/drivers/xen/xen-acpi-processor.c
index b590ee067fcd..316df65163cf 100644
--- a/trunk/drivers/xen/xen-acpi-processor.c
+++ b/trunk/drivers/xen/xen-acpi-processor.c
@@ -98,7 +98,6 @@ static int push_cxx_to_hypervisor(struct acpi_processor *_pr)
 
 		dst_cx->type = cx->type;
 		dst_cx->latency = cx->latency;
-		dst_cx->power = cx->power;
 
 		dst_cx->dpcnt = 0;
 		set_xen_guest_handle(dst_cx->dp, NULL);
diff --git a/trunk/include/acpi/processor.h b/trunk/include/acpi/processor.h
index 64ec644808bc..db427fa8cf82 100644
--- a/trunk/include/acpi/processor.h
+++ b/trunk/include/acpi/processor.h
@@ -59,7 +59,6 @@ struct acpi_processor_cx {
 	u8 entry_method;
 	u8 index;
 	u32 latency;
-	u32 power;
 	u8 bm_sts_skip;
 	char desc[ACPI_CX_DESC_LEN];
 };