git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into for-next
[pandora-kernel.git]
/
drivers
/
cpuidle
/
sysfs.c
diff --git
a/drivers/cpuidle/sysfs.c
b/drivers/cpuidle/sysfs.c
index
0310ffa
..
be7917e
100644
(file)
--- a/
drivers/cpuidle/sysfs.c
+++ b/
drivers/cpuidle/sysfs.c
@@
-300,7
+300,7
@@
static struct kobj_type ktype_state_cpuidle = {
.release = cpuidle_state_sysfs_release,
};
.release = cpuidle_state_sysfs_release,
};
-static
void inline
cpuidle_free_state_kobj(struct cpuidle_device *device, int i)
+static
inline void
cpuidle_free_state_kobj(struct cpuidle_device *device, int i)
{
kobject_put(&device->kobjs[i]->kobj);
wait_for_completion(&device->kobjs[i]->kobj_unregister);
{
kobject_put(&device->kobjs[i]->kobj);
wait_for_completion(&device->kobjs[i]->kobj_unregister);