diff --git a/[refs] b/[refs] index 7ac3c55e30ef..847b9ade6f31 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: db70b04407a63668e5fee773f76f90367492fd25 +refs/heads/master: e07510585a88c0f6c6c728e2e006aa913496d4ae diff --git a/trunk/include/linux/cpuidle.h b/trunk/include/linux/cpuidle.h index f7f1d9040da3..f3ebbba368b3 100644 --- a/trunk/include/linux/cpuidle.h +++ b/trunk/include/linux/cpuidle.h @@ -98,7 +98,6 @@ struct cpuidle_device { struct list_head device_list; struct kobject kobj; struct completion kobj_unregister; - void *governor_data; }; DECLARE_PER_CPU(struct cpuidle_device *, cpuidle_devices);