diff --git a/[refs] b/[refs] index d1a7e3e20122..23e0fac3221d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9cddad77574313fcee36c5e60122718daa7c0361 +refs/heads/master: cc4900690bf77257996e90f0059eb074b8db52e6 diff --git a/trunk/include/linux/pm.h b/trunk/include/linux/pm.h index 3fd65ad4b097..6e7f06671683 100644 --- a/trunk/include/linux/pm.h +++ b/trunk/include/linux/pm.h @@ -268,7 +268,6 @@ struct dev_pm_info { #ifdef CONFIG_PM unsigned should_wakeup:1; pm_message_t prev_state; - void * saved_state; struct list_head entry; #endif };