projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'powercap' and 'pm-devfreq'
[linux-2.6-microblaze.git]
/
drivers
/
cpuidle
/
cpuidle.c
diff --git
a/drivers/cpuidle/cpuidle.c
b/drivers/cpuidle/cpuidle.c
index
080bd2d
..
7a73a27
100644
(file)
--- a/
drivers/cpuidle/cpuidle.c
+++ b/
drivers/cpuidle/cpuidle.c
@@
-330,9
+330,6
@@
int cpuidle_enable_device(struct cpuidle_device *dev)
if (!dev->registered)
return -EINVAL;
- if (!dev->state_count)
- dev->state_count = drv->state_count;
-
ret = cpuidle_add_device_sysfs(dev);
if (ret)
return ret;