From patchwork Wed Nov 27 17:38:42 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilia Mirkin X-Patchwork-Id: 3249181 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id EB50EC045B for ; Wed, 27 Nov 2013 17:39:13 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3DA65205C4 for ; Wed, 27 Nov 2013 17:39:09 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 7C386205C2 for ; Wed, 27 Nov 2013 17:39:07 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 73635FAC10; Wed, 27 Nov 2013 09:39:04 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qa0-f47.google.com (mail-qa0-f47.google.com [209.85.216.47]) by gabe.freedesktop.org (Postfix) with ESMTP id 04BABFAA18; Wed, 27 Nov 2013 09:39:01 -0800 (PST) Received: by mail-qa0-f47.google.com with SMTP id w5so5998786qac.6 for ; Wed, 27 Nov 2013 09:39:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id; bh=rQKY4+A5g5XHrE3QqTOlxjs+6qcrg4FICpWUKPaUgKU=; b=JT2wtslnO59gwmLKJrb37X/u+VXvIbGGVCaoN7gNofTCGl1DRb6UL0DDr0lW4F1XLg VmBJLXApPmJEtso+JZxtTTWKkbIXFQv10fmQ9+592IKQpn/aA5lfc79DR2uQTcsgj38S /ITfSBRVwEmqJ3m55ZfdOKr+77Mt8w4e/TyaKO3aBgh6RGyNx9I4nh85LT9CFKFOsE8k Cr5MK3OQ0PYjh3MgAswixj69DgWEUumnJ2DG8YUvzf83PFdsV3zHohIEDbICV2taWZpo HBLYUy5o5qUMgYS4nDcp8gPpu0QIm2z+RhOoVX2ySU0sV9rVT+y3Aby+TPQDT1+4TmBn 40iw== X-Received: by 10.224.165.133 with SMTP id i5mr69233616qay.11.1385573940346; Wed, 27 Nov 2013 09:39:00 -0800 (PST) Received: from localhost.localdomain (cpe-74-71-31-84.nyc.res.rr.com. [74.71.31.84]) by mx.google.com with ESMTPSA id n7sm20471048qai.1.2013.11.27.09.38.59 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Nov 2013 09:38:59 -0800 (PST) From: Ilia Mirkin To: Ben Skeggs Subject: [PATCH] drm/nouveau/hwmon: fix compilation without CONFIG_HWMON Date: Wed, 27 Nov 2013 12:38:42 -0500 Message-Id: <1385573922-16278-1-git-send-email-imirkin@alum.mit.edu> X-Mailer: git-send-email 1.8.3.2 Cc: nouveau@lists.freedesktop.org, Jim Davis , dri-devel@lists.freedesktop.org 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: , MIME-Version: 1.0 Sender: dri-devel-bounces@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Reported-by: Jim Davis Signed-off-by: Ilia Mirkin --- drivers/gpu/drm/nouveau/nouveau_hwmon.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_hwmon.c b/drivers/gpu/drm/nouveau/nouveau_hwmon.c index 38a4db5..4aff04f 100644 --- a/drivers/gpu/drm/nouveau/nouveau_hwmon.c +++ b/drivers/gpu/drm/nouveau/nouveau_hwmon.c @@ -630,7 +630,6 @@ error: hwmon->hwmon = NULL; return ret; #else - hwmon->hwmon = NULL; return 0; #endif }