From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754853AbbIWN7J (ORCPT ); Wed, 23 Sep 2015 09:59:09 -0400 Received: from bh-25.webhostbox.net ([208.91.199.152]:45638 "EHLO bh-25.webhostbox.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754286AbbIWN7H (ORCPT ); Wed, 23 Sep 2015 09:59:07 -0400 Subject: Re: [PATCH] watchdog: iTCO: Fix dependencies on I2C To: Matt Fleming References: <1441978088-27288-1-git-send-email-linux@roeck-us.net> <20150923103206.GC2867@codeblueprint.co.uk> Cc: Wim Van Sebroeck , linux-watchdog@vger.kernel.org, linux-kernel@vger.kernel.org, Matt Fleming , Lee Jones From: Guenter Roeck Message-ID: <5602B025.8030109@roeck-us.net> Date: Wed, 23 Sep 2015 06:59:01 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.2.0 MIME-Version: 1.0 In-Reply-To: <20150923103206.GC2867@codeblueprint.co.uk> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit X-Authenticated_sender: linux@roeck-us.net X-OutGoing-Spam-Status: No, score=-1.0 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - bh-25.webhostbox.net X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - roeck-us.net X-Get-Message-Sender-Via: bh-25.webhostbox.net: authenticated_id: linux@roeck-us.net X-Source: X-Source-Args: X-Source-Dir: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 09/23/2015 03:32 AM, Matt Fleming wrote: > On Fri, 11 Sep, at 06:28:08AM, Guenter Roeck wrote: >> If I2C is built as module, the iTCO watchdog driver must be built as module >> as well. I2C_I801 must only be selected if I2C is configured. >> >> This fixes the following build errors, seen if I2C=m and ITCO_WDT=y. >> >> i2c-i801.c:(.text+0x2bf055): undefined reference to `i2c_del_adapter' >> i2c-i801.c:(.text+0x2c13e0): undefined reference to `i2c_add_adapter' >> i2c-i801.c:(.text+0x2c17bd): undefined reference to `i2c_new_device' >> >> Fixes: 2a7a0e9bf7b3 ("watchdog: iTCO_wdt: Add support for TCO on Intel Sunrisepoint") >> Cc: Matt Fleming >> Cc: Lee Jones >> Signed-off-by: Guenter Roeck >> --- >> drivers/watchdog/Kconfig | 3 ++- >> 1 file changed, 2 insertions(+), 1 deletion(-) >> >> diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig >> index 55c4b5b0a317..75c358ce71a7 100644 >> --- a/drivers/watchdog/Kconfig >> +++ b/drivers/watchdog/Kconfig >> @@ -797,8 +797,9 @@ config ITCO_WDT >> tristate "Intel TCO Timer/Watchdog" >> depends on (X86 || IA64) && PCI >> select WATCHDOG_CORE >> + depends on I2C || I2C=n >> select LPC_ICH if !EXPERT >> - select I2C_I801 if !EXPERT >> + select I2C_I801 if !EXPERT && I2C >> ---help--- >> Hardware driver for the intel TCO timer based watchdog devices. >> These drivers are included in the Intel 82801 I/O Controller > > Whoops, thanks for catching this Guenter. Are you going to send this > to Linus? > Wim should do that. > Reviewed-by: Matt Fleming > Thanks for the review. Guenter