[PATCH] Fix up some pm_message_t types