Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile

[cascardo/linux.git] / arch / arm / mach-omap2 / cpuidle34xx.c

diff --git a/arch/arm/mach-omap2/cpuidle34xx.c b/arch/arm/mach-omap2/cpuidle34xx.c
index e18709d..aa7b379 100644 (file)
--- a/arch/arm/mach-omap2/cpuidle34xx.c
+++ b/arch/arm/mach-omap2/cpuidle34xx.c
@@ -265,7 +265,6 @@ static struct cpuidle_driver omap3_idle_driver = {
                        .enter            = omap3_enter_idle_bm,
                        .exit_latency     = 2 + 2,
                        .target_residency = 5,
-                       .flags            = CPUIDLE_FLAG_TIME_VALID,
                        .name             = "C1",
                        .desc             = "MPU ON + CORE ON",
                },
@@ -273,7 +272,6 @@ static struct cpuidle_driver omap3_idle_driver = {
                        .enter            = omap3_enter_idle_bm,
                        .exit_latency     = 10 + 10,
                        .target_residency = 30,
-                       .flags            = CPUIDLE_FLAG_TIME_VALID,
                        .name             = "C2",
                        .desc             = "MPU ON + CORE ON",
                },
@@ -281,7 +279,6 @@ static struct cpuidle_driver omap3_idle_driver = {
                        .enter            = omap3_enter_idle_bm,
                        .exit_latency     = 50 + 50,
                        .target_residency = 300,
-                       .flags            = CPUIDLE_FLAG_TIME_VALID,
                        .name             = "C3",
                        .desc             = "MPU RET + CORE ON",
                },
@@ -289,7 +286,6 @@ static struct cpuidle_driver omap3_idle_driver = {
                        .enter            = omap3_enter_idle_bm,
                        .exit_latency     = 1500 + 1800,
                        .target_residency = 4000,
-                       .flags            = CPUIDLE_FLAG_TIME_VALID,
                        .name             = "C4",
                        .desc             = "MPU OFF + CORE ON",
                },
@@ -297,7 +293,6 @@ static struct cpuidle_driver omap3_idle_driver = {
                        .enter            = omap3_enter_idle_bm,
                        .exit_latency     = 2500 + 7500,
                        .target_residency = 12000,
-                       .flags            = CPUIDLE_FLAG_TIME_VALID,
                        .name             = "C5",
                        .desc             = "MPU RET + CORE RET",
                },
@@ -305,7 +300,6 @@ static struct cpuidle_driver omap3_idle_driver = {
                        .enter            = omap3_enter_idle_bm,
                        .exit_latency     = 3000 + 8500,
                        .target_residency = 15000,
-                       .flags            = CPUIDLE_FLAG_TIME_VALID,
                        .name             = "C6",
                        .desc             = "MPU OFF + CORE RET",
                },
@@ -313,7 +307,6 @@ static struct cpuidle_driver omap3_idle_driver = {
                        .enter            = omap3_enter_idle_bm,
                        .exit_latency     = 10000 + 30000,
                        .target_residency = 30000,
-                       .flags            = CPUIDLE_FLAG_TIME_VALID,
                        .name             = "C7",
                        .desc             = "MPU OFF + CORE OFF",
                },