Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932479AbWBBXpJ (ORCPT ); Thu, 2 Feb 2006 18:45:09 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932480AbWBBXpJ (ORCPT ); Thu, 2 Feb 2006 18:45:09 -0500 Received: from mx1.redhat.com ([66.187.233.31]:22962 "EHLO mx1.redhat.com") by vger.kernel.org with ESMTP id S932479AbWBBXpH (ORCPT ); Thu, 2 Feb 2006 18:45:07 -0500 Date: Thu, 2 Feb 2006 18:45:02 -0500 From: Dave Jones To: Linux Kernel Cc: Linus Torvalds Subject: Fix build failure in recent pm_prepare_* changes. Message-ID: <20060202234501.GA4091@redhat.com> Mail-Followup-To: Dave Jones , Linux Kernel , Linus Torvalds Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.4.1i Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1126 Lines: 25 kernel/power/power.h:49: error: static declaration of 'pm_prepare_console' follows non-static declaration include/linux/suspend.h:46: error: previous declaration of 'pm_prepare_console' was here kernel/power/power.h:50: error: static declaration of 'pm_restore_console' follows non-static declaration include/linux/suspend.h:47: error: previous declaration of 'pm_restore_console' was here Signed-off-by: Dave Jones --- linux-2.6.15.noarch/include/linux/suspend.h~ 2006-02-02 16:27:38.000000000 -0500 +++ linux-2.6.15.noarch/include/linux/suspend.h 2006-02-02 16:28:07.000000000 -0500 @@ -42,10 +42,6 @@ extern void mark_free_pages(struct 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) { - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/