From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 19CD5C2BB55 for ; Thu, 16 Apr 2020 13:44:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E160020732 for ; Thu, 16 Apr 2020 13:44:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587044657; bh=MnuWYLFkdb1YHimhXS6d0CxSVI1WAlx/FlXUz917YfU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=mVvX+QffNlEU/Mpm1s5xEuJTFEusa3fGK+Gao5CA3d5WkYN2H47dr6KQDbrN1XlBp B+F8v/SDpY8wwaso90viL2vZ0O9gZhKuNYONOnhl5n69wg2dIE5+//NPOw35YcYbTc jVI1l7RbVo0G0eJTWM0rqw0QggfF9VkozAz/2QWY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2898386AbgDPNoP (ORCPT ); Thu, 16 Apr 2020 09:44:15 -0400 Received: from mail.kernel.org ([198.145.29.99]:45448 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2896835AbgDPNeD (ORCPT ); Thu, 16 Apr 2020 09:34:03 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 101FE21BE5; Thu, 16 Apr 2020 13:34:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587044042; bh=MnuWYLFkdb1YHimhXS6d0CxSVI1WAlx/FlXUz917YfU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Pp2DmqwkByKRD7ZmqBrTrXdbtU7s+KJEr6rUhUOFTeYmsQ7falZuQ/V6shG73f3RF wklwgo53WSTyNtuW453Hzg07HUWWVa4kXX31z0AvaAuNjHb/PlNo7mfNZcfjbXoKeW L0gZDqGls4+bXs9yflp8g8QK1fB/oNbXQzV7mxIg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, rdunlap@infradead.org, Matt Ranostay , Hans Verkuil , Mauro Carvalho Chehab , Sasha Levin Subject: [PATCH 5.5 057/257] media: i2c: video-i2c: fix build errors due to imply hwmon Date: Thu, 16 Apr 2020 15:21:48 +0200 Message-Id: <20200416131333.103561491@linuxfoundation.org> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200416131325.891903893@linuxfoundation.org> References: <20200416131325.891903893@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Matt Ranostay [ Upstream commit 64d4fc9926f09861a35d8f0f7d81f056e6d5af7b ] Fix build fault when CONFIG_HWMON is a module, and CONFIG_VIDEO_I2C as builtin. This is due to 'imply hwmon' in the respective Kconfig. Issue build log: ld: drivers/media/i2c/video-i2c.o: in function `amg88xx_hwmon_init': video-i2c.c:(.text+0x2e1): undefined reference to `devm_hwmon_device_register_with_info Cc: rdunlap@infradead.org Fixes: acbea6798955 (media: video-i2c: add hwmon support for amg88xx) Signed-off-by: Matt Ranostay Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/media/i2c/video-i2c.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/i2c/video-i2c.c b/drivers/media/i2c/video-i2c.c index 078141712c887..0b977e73ceb29 100644 --- a/drivers/media/i2c/video-i2c.c +++ b/drivers/media/i2c/video-i2c.c @@ -255,7 +255,7 @@ static int amg88xx_set_power(struct video_i2c_data *data, bool on) return amg88xx_set_power_off(data); } -#if IS_ENABLED(CONFIG_HWMON) +#if IS_REACHABLE(CONFIG_HWMON) static const u32 amg88xx_temp_config[] = { HWMON_T_INPUT, -- 2.20.1