From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933855AbcAKSfF (ORCPT ); Mon, 11 Jan 2016 13:35:05 -0500 Received: from mezzanine.sirena.org.uk ([106.187.55.193]:48015 "EHLO mezzanine.sirena.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932616AbcAKSfC (ORCPT ); Mon, 11 Jan 2016 13:35:02 -0500 From: Mark Brown To: Arnd Bergmann , Mark Brown Cc: linux-kernel@vger.kernel.org In-Reply-To: <7607130.s0M7SSqlJV@wuerfel> Message-Id: Date: Mon, 11 Jan 2016 18:34:46 +0000 X-SA-Exim-Connect-IP: 2a01:348:6:8808:fab::3 X-SA-Exim-Mail-From: broonie@sirena.org.uk Subject: Applied "regulator: max8973: add THERMAL_OF dependency" to the regulator tree X-SA-Exim-Version: 4.2.1 (built Mon, 26 Dec 2011 16:24:06 +0000) X-SA-Exim-Scanned: Yes (on mezzanine.sirena.org.uk) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The patch regulator: max8973: add THERMAL_OF dependency has been applied to the regulator tree at git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >>From 0e3571989d329ea7d356c0e29e267df0567f5165 Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Fri, 8 Jan 2016 21:06:43 +0100 Subject: [PATCH] regulator: max8973: add THERMAL_OF dependency >>From 9f5ddfc667eb45dc2c5459e5acc5de45572456cd Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Fri, 8 Jan 2016 20:59:29 +0100 Subject: [PATCH] regulator: max8973: add THERMAL_OF dependency The max8973 regulator driver has gained thermal support, but it now fails to link when the driver is built-in and CONFIG_THERMAL=m: drivers/built-in.o: In function `max8973_remove': console.c:(.text+0x94ac4): undefined reference to `thermal_zone_of_sensor_unregister' drivers/built-in.o: In function `max8973_probe': console.c:(.text+0x95710): undefined reference to `thermal_zone_of_sensor_register' This adds a dependency "depends on THERMAL || !THERMAL_OF" to ensure that the driver cannot be built-in when THERMAL=m but is forced to be a module as well, unless THERMAL_OF is disabled. Signed-off-by: Arnd Bergmann Fixes: 1b7a4c6a9eea ("regulator: max8973: add support for junction thermal warning") Signed-off-by: Mark Brown --- drivers/regulator/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig index 8df0b0e62976..e58517f27a3a 100644 --- a/drivers/regulator/Kconfig +++ b/drivers/regulator/Kconfig @@ -374,6 +374,7 @@ config REGULATOR_MAX8952 config REGULATOR_MAX8973 tristate "Maxim MAX8973 voltage regulator " depends on I2C + depends on THERMAL || !THERMAL_OF select REGMAP_I2C help The MAXIM MAX8973 high-efficiency. three phase, DC-DC step-down -- 2.7.0.rc3