From patchwork Wed Jul 25 07:46:21 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fengguang Wu X-Patchwork-Id: 1235901 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork1.kernel.org (Postfix) with ESMTP id C49A03FD4F for ; Wed, 25 Jul 2012 07:53:11 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A260CA0B09 for ; Wed, 25 Jul 2012 00:53:11 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mga14.intel.com (mga14.intel.com [143.182.124.37]) by gabe.freedesktop.org (Postfix) with ESMTP id 967B3A0B00 for ; Wed, 25 Jul 2012 00:46:24 -0700 (PDT) Received: from azsmga002.ch.intel.com ([10.2.17.35]) by azsmga102.ch.intel.com with ESMTP; 25 Jul 2012 00:46:24 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.71,315,1320652800"; d="scan'208";a="126639344" Received: from wfg-t420.sh.intel.com ([10.239.194.167]) by AZSMGA002.ch.intel.com with ESMTP; 25 Jul 2012 00:46:23 -0700 Received: from wfg by wfg-t420.sh.intel.com with local (Exim 4.77) (envelope-from ) id 1StwIX-0004aE-Js; Wed, 25 Jul 2012 15:46:21 +0800 Date: Wed, 25 Jul 2012 15:46:21 +0800 From: Fengguang Wu To: Dave Airlie Subject: [PATCH] fix nouveau build error on !CONFIG_MXM_WMI Message-ID: <20120725074621.GA17467@localhost> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) Cc: "linux-ia64@vger.kernel.org" , LKML , dri-devel@lists.freedesktop.org, Ben Skeggs X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Fix build error on IA64: ERROR: "mxm_wmi_supported" [drivers/gpu/drm/nouveau/nouveau.ko] undefined! Signed-off-by: Fengguang Wu --- include/linux/mxm-wmi.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/linux/mxm-wmi.h b/include/linux/mxm-wmi.h index 617a295..f6a6214 100644 --- a/include/linux/mxm-wmi.h +++ b/include/linux/mxm-wmi.h @@ -28,6 +28,14 @@ #define MXM_MXDS_ADAPTER_IGD 0x10 int mxm_wmi_call_mxds(int adapter); int mxm_wmi_call_mxmx(int adapter); + +#if IS_ENABLED(CONFIG_MXM_WMI) bool mxm_wmi_supported(void); +#else +static inline bool mxm_wmi_supported(void) +{ + return false; +} +#endif #endif