From 0ee7a02da45e8628246270a295682cf5360b38e5 Mon Sep 17 00:00:00 2001
From: David Howells <dhowells@redhat.com>
Date: Thu, 15 Dec 2011 13:03:14 +0000
Subject: [PATCH] --- yaml --- r: 286495 b: refs/heads/master c:
 95e3ec11491d0cbce9fcdf1cc17a527c114c7dcf h: refs/heads/master i:   286493:
 6336e6653ea3cc98fe8ac9c51945edecfc680bc6   286491:
 008c55792c55114a28f027446cfe2b076c279607   286487:
 183413aedf1d6f16bbaefc08adfa5a151acf3b80   286479:
 cdd25e5bd9e3502d54c7236b974e5630330830ac   286463:
 f4357b2db6eca05e95af112dcb5b0a3f6cfda951 v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/idle/intel_idle.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d42eb4bfdf57..87d715944f04 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2e92c7ad8f269c2b5b7f2a4763675f55f00b75f5
+refs/heads/master: 95e3ec11491d0cbce9fcdf1cc17a527c114c7dcf
diff --git a/trunk/drivers/idle/intel_idle.c b/trunk/drivers/idle/intel_idle.c
index 920c61c730a1..18f9ad814104 100644
--- a/trunk/drivers/idle/intel_idle.c
+++ b/trunk/drivers/idle/intel_idle.c
@@ -197,7 +197,7 @@ static struct cpuidle_state atom_cstates[MWAIT_MAX_NUM_CSTATES] = {
 		.enter = &intel_idle },
 };
 
-static int get_driver_data(int cstate)
+static long get_driver_data(int cstate)
 {
 	int driver_data;
 	switch (cstate) {