From patchwork Fri Feb 15 16:17:58 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jesse Barnes X-Patchwork-Id: 2148861 Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 3BAFDDF24C for ; Fri, 15 Feb 2013 16:17:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935864Ab3BOQRY (ORCPT ); Fri, 15 Feb 2013 11:17:24 -0500 Received: from oproxy7-pub.bluehost.com ([67.222.55.9]:52941 "HELO oproxy7-pub.bluehost.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S935920Ab3BOQRX (ORCPT ); Fri, 15 Feb 2013 11:17:23 -0500 Received: (qmail 24426 invoked by uid 0); 15 Feb 2013 16:17:22 -0000 Received: from unknown (HELO box514.bluehost.com) (74.220.219.114) by oproxy7.bluehost.com with SMTP; 15 Feb 2013 16:17:22 -0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=virtuousgeek.org; s=default; h=Message-Id:Date:Subject:Cc:To:From; bh=XLFZA/qW73LflFqHI3FVDjFg9Axi5qSUWNRdeKi88J8=; b=eOnOippLj94UHp+EmyQXHC5vTQOeCXozpHT75fzO8YkaFMjrYvofd6cQFCCfYQ9jxH48PA0ErznxtExycMifZv8AUvF+lsQ8qBP5kPntZINxpGhhd5lKKFwYWY0tK3+V; Received: from [67.161.37.189] (port=51865 helo=jbarnes-desktop.intel.com) by box514.bluehost.com with esmtpsa (TLSv1:CAMELLIA256-SHA:256) (Exim 4.80) (envelope-from ) id 1U6NyT-0006W9-S5; Fri, 15 Feb 2013 09:17:21 -0700 From: Jesse Barnes To: linux-kernel@vger.kernel.org Cc: linux-pm@vger.kernel.org, intel-gfx@lists.freedesktop.org Subject: [PATCH] pm: provide stubs for PM VT console switch routines Date: Fri, 15 Feb 2013 08:17:58 -0800 Message-Id: <1360945078-27865-1-git-send-email-jbarnes@virtuousgeek.org> X-Mailer: git-send-email 1.7.9.5 X-Identified-User: {10642:box514.bluehost.com:virtuous:virtuousgeek.org} {sentby:smtp auth 67.161.37.189 authed with jbarnes@virtuousgeek.org} Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org If PM_SLEEP is disabled, we need stub versions of these functions. v2: fix up struct device forward decl. Signed-off-by: Jesse Barnes --- include/linux/pm.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/include/linux/pm.h b/include/linux/pm.h index 98310eb..e5da2f3 100644 --- a/include/linux/pm.h +++ b/include/linux/pm.h @@ -36,8 +36,17 @@ extern void (*pm_power_off)(void); extern void (*pm_power_off_prepare)(void); struct device; /* we have a circular dep with device.h */ +#ifdef CONFIG_VT_CONSOLE_SLEEP extern void pm_vt_switch_required(struct device *dev, bool required); extern void pm_vt_switch_unregister(struct device *dev); +#else +static inline void pm_vt_switch_required(struct device *dev, bool required) +{ +} +static inline void pm_vt_switch_unregister(struct device *dev) +{ +} +#endif /* CONFIG_VT_CONSOLE_SLEEP */ /* * Device power management