diff --git a/[refs] b/[refs] index ed909bc50e66..d6c092d19816 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d7ac12fa05ed839d5a426795409fdf1a480e3f7a +refs/heads/master: b5556a67f08559b6c1597f6396c1f9ef460f62b4 diff --git a/trunk/include/linux/cpuidle.h b/trunk/include/linux/cpuidle.h index c4e00161a247..b0fd85ab9efb 100644 --- a/trunk/include/linux/cpuidle.h +++ b/trunk/include/linux/cpuidle.h @@ -79,7 +79,7 @@ struct cpuidle_state_kobj { }; struct cpuidle_device { - int enabled:1; + unsigned int enabled:1; unsigned int cpu; int last_residency;