WAKELOCK: Enable wakelock in PMU driver for Android kernel

Change-Id: I5a7789f6df35a218359bc4756110c90bcb898f4a
Signed-off-by: Fei Yang <fei.yang@intel.com>

diff --git a/arch/x86/platform/mfld/pmu.c b/arch/x86/platform/mfld/pmu.c
index f8102fc..fdc0403 100755 (executable)
--- a/arch/x86/platform/mfld/pmu.c
+++ b/arch/x86/platform/mfld/pmu.c
@@ -32,6 +32,7 @@
 #include <linux/jhash.h>
 #include <linux/intel_mid_pm.h>
 #include <linux/suspend.h>
+#include <linux/wakelock.h>
 
 #include "pmu.h"
 

diff --git a/drivers/idle/intel_idle.c b/drivers/idle/intel_idle.c
index d99f315..c9871d4 100644 (file)
--- a/drivers/idle/intel_idle.c
+++ b/drivers/idle/intel_idle.c
@@ -384,7 +384,6 @@ static int intel_idle_probe(void)
 
 
        case 0x26:      /* 38 - Lincroft Atom Processor */
-               cpuidle_state_table = mrst_cstates;
 #ifdef CONFIG_X86_MRST
                intel_idle_platform_prepare = &mrst_pmu_invalid_cstates;
 #endif