From mboxrd@z Thu Jan 1 00:00:00 1970 From: Martin Peres Subject: Re: linux-next: Tree for October 25 (nouveau_pm) Date: Tue, 26 Oct 2010 12:54:40 +0200 Message-ID: <4CC6B370.80800@free.fr> References: <20101025145834.9b68e026.sfr@canb.auug.org.au> <20101025165926.5eed9811.randy.dunlap@oracle.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------000303090505000403050303" Return-path: Received: from smtp4-g21.free.fr (smtp4-g21.free.fr [212.27.42.4]) by gabe.freedesktop.org (Postfix) with ESMTP id D86379E752 for ; Tue, 26 Oct 2010 03:54:20 -0700 (PDT) Received: from [192.168.0.1] (unknown [82.246.199.246]) by smtp4-g21.free.fr (Postfix) with ESMTP id 32A0F4C813B for ; Tue, 26 Oct 2010 12:54:14 +0200 (CEST) In-Reply-To: <20101025165926.5eed9811.randy.dunlap@oracle.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org Errors-To: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org To: dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org This is a multi-part message in MIME format. --------------000303090505000403050303 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: quoted-printable Le 26/10/2010 01:59, Randy Dunlap a =E9crit : > On Mon, 25 Oct 2010 14:58:34 +1100 Stephen Rothwell wrote: > >> Hi all, >> >> Reminder: do not add 2.6.38 destined stuff to linux-next until after >> 2.6.37-rc1 is released. > > drivers/built-in.o: In function `nouveau_hwmon_init': > nouveau_pm.c:(.text+0x179825): undefined reference to `hwmon_device_reg= ister' > nouveau_pm.c:(.text+0x1798b9): undefined reference to `hwmon_device_unr= egister' > > > config file is attached. Thanks, this compiles fine with the attached patch. I'm ready to rework it if needed. Martin --------------000303090505000403050303 Content-Type: text/x-patch; name="0001-Fix-compilation-issues-in-nouveau_pm-when-CONFIG_HWM.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename*0="0001-Fix-compilation-issues-in-nouveau_pm-when-CONFIG_HWM.pa"; filename*1="tch" >>From 4f4af7ac5be0f418a3c0cbca1b44ab4f93216060 Mon Sep 17 00:00:00 2001 From: Martin Peres Date: Tue, 26 Oct 2010 12:48:28 +0200 Subject: [PATCH] Fix compilation issues in nouveau_pm when CONFIG_HWMON is not set Signed-off-by: Martin Peres --- drivers/gpu/drm/nouveau/nouveau_pm.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_pm.c b/drivers/gpu/drm/nouveau/nouveau_pm.c index 8ef1d5b..f691661 100644 --- a/drivers/gpu/drm/nouveau/nouveau_pm.c +++ b/drivers/gpu/drm/nouveau/nouveau_pm.c @@ -405,12 +405,15 @@ nouveau_hwmon_init(struct drm_device *dev) { struct drm_nouveau_private *dev_priv = dev->dev_private; struct nouveau_pm_engine *pm = &dev_priv->engine.pm; +#ifdef CONFIG_HWMON struct device *hwmon_dev; int ret; +#endif if (!pm->temp_get) return -ENODEV; +#ifdef CONFIG_HWMON hwmon_dev = hwmon_device_register(&dev->pdev->dev); if (IS_ERR(hwmon_dev)) { ret = PTR_ERR(hwmon_dev); @@ -429,6 +432,9 @@ nouveau_hwmon_init(struct drm_device *dev) } pm->hwmon = hwmon_dev; +#else + pm->hwmon = NULL; +#endif return 0; } @@ -436,6 +442,7 @@ nouveau_hwmon_init(struct drm_device *dev) static void nouveau_hwmon_fini(struct drm_device *dev) { +#ifdef CONFIG_HWMON struct drm_nouveau_private *dev_priv = dev->dev_private; struct nouveau_pm_engine *pm = &dev_priv->engine.pm; @@ -443,6 +450,7 @@ nouveau_hwmon_fini(struct drm_device *dev) sysfs_remove_group(&pm->hwmon->kobj, &hwmon_attrgroup); hwmon_device_unregister(pm->hwmon); } +#endif } #ifdef CONFIG_ACPI -- 1.7.3.2 --------------000303090505000403050303 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/dri-devel --------------000303090505000403050303--