From patchwork Wed Jul 25 14:36:58 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fengguang Wu X-Patchwork-Id: 1237861 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork2.kernel.org (Postfix) with ESMTP id E374EDFFCD for ; Wed, 25 Jul 2012 14:37:19 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B2FDBA0C2D for ; Wed, 25 Jul 2012 07:37:19 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id 3350D9E744 for ; Wed, 25 Jul 2012 07:37:06 -0700 (PDT) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga101.fm.intel.com with ESMTP; 25 Jul 2012 07:37:06 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.71,315,1320652800"; d="scan'208";a="185943496" Received: from unknown (HELO wfg-t420.sh.intel.com) ([10.255.20.152]) by fmsmga001.fm.intel.com with ESMTP; 25 Jul 2012 07:37:00 -0700 Received: from wfg by wfg-t420.sh.intel.com with local (Exim 4.77) (envelope-from ) id 1Su2hu-0000RC-76; Wed, 25 Jul 2012 22:36:58 +0800 Date: Wed, 25 Jul 2012 22:36:58 +0800 From: Fengguang Wu To: Dave Airlie Subject: Re: [PATCH] nouveau: fix build error on IA64 Message-ID: <20120725143658.GA1651@localhost> References: <20120725080008.GA18012@localhost> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20120725080008.GA18012@localhost> 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 > - select ACPI_WMI if ACPI > + select ACPI_WMI if ACPI && !IA64 > select MXM_WMI if ACPI Sorry, the MXM_WMI line should also be changed. Although MXM_WMI depends on ACPI_WMI, "select" is dumb and will ignore that dependency.. Thanks, Fengguang --- From: Fengguang Wu Date: Wed, 25 Jul 2012 15:56:35 +0800 Subject: [PATCH] nouveau: fix build error on IA64 I'm not sure if this is the best way, however it does fix these link errors on IA64: ERROR: "wmi_has_guid" [drivers/gpu/drm/nouveau/nouveau.ko] undefined! ERROR: "wmi_evaluate_method" [drivers/gpu/drm/nouveau/nouveau.ko] undefined! Signed-off-by: Fengguang Wu --- drivers/gpu/drm/nouveau/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- linux.orig/drivers/gpu/drm/nouveau/Kconfig 2012-07-25 19:09:37.715358715 +0800 +++ linux/drivers/gpu/drm/nouveau/Kconfig 2012-07-25 22:34:43.775298923 +0800 @@ -11,8 +11,8 @@ config DRM_NOUVEAU select FRAMEBUFFER_CONSOLE if !EXPERT select FB_BACKLIGHT if DRM_NOUVEAU_BACKLIGHT select ACPI_VIDEO if ACPI && X86 && BACKLIGHT_CLASS_DEVICE && VIDEO_OUTPUT_CONTROL && INPUT - select ACPI_WMI if ACPI - select MXM_WMI if ACPI + select ACPI_WMI if ACPI && !IA64 + select MXM_WMI if ACPI && !IA64 select POWER_SUPPLY help Choose this option for open-source nVidia support.