diff --git a/[refs] b/[refs] index b3cdd17b330c..389bb1f07cd8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 278ff9537030bbb292b33504f5e1f6e0126793eb +refs/heads/master: c0c1633bdb844ec5b4ac15c97ab8927d80550c42 diff --git a/trunk/include/linux/suspend.h b/trunk/include/linux/suspend.h index 5dc94e777fab..43bcd13eb1ec 100644 --- a/trunk/include/linux/suspend.h +++ b/trunk/include/linux/suspend.h @@ -42,10 +42,6 @@ extern void mark_free_pages(struct zone *zone); #ifdef CONFIG_PM /* kernel/power/swsusp.c */ extern int software_suspend(void); - -extern int pm_prepare_console(void); -extern void pm_restore_console(void); - #else static inline int software_suspend(void) {