diff --git a/[refs] b/[refs]
index 401ee1ffeee1..0d06c783c11d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 36ce8d4f5fecc20c2dfb08f24fe01c5eb81f6245
+refs/heads/master: 748f11772154b58426c856b7d90538a9b60ae29a
diff --git a/trunk/arch/arm/mach-davinci/cpuidle.c b/trunk/arch/arm/mach-davinci/cpuidle.c
index 5e430bffb5d8..5ac9e9384b15 100644
--- a/trunk/arch/arm/mach-davinci/cpuidle.c
+++ b/trunk/arch/arm/mach-davinci/cpuidle.c
@@ -96,8 +96,6 @@ static int __init davinci_cpuidle_probe(struct platform_device *pdev)
 
 	ddr2_pdown = pdata->ddr2_pdown;
 
-	device->state_count = DAVINCI_CPUIDLE_MAX_STATES;
-
 	ret = cpuidle_register_driver(&davinci_idle_driver);
 	if (ret) {
 		dev_err(&pdev->dev, "failed to register driver\n");