* linux-next: manual merge of the arm-soc tree with the battery tree
@ 2012-11-27 4:52 Stephen Rothwell
2012-11-27 8:38 ` Arnd Bergmann
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2012-11-27 4:52 UTC (permalink / raw)
To: Olof Johansson, Arnd Bergmann, linux-arm-kernel
Cc: linux-next, linux-kernel, Jamie Lentin, Andrew Lunn,
Jason Cooper, Rajanikanth H.V, Anton Vorontsov
[-- Attachment #1: Type: text/plain, Size: 1038 bytes --]
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
drivers/power/Kconfig between commit bd9e8ab2d58d ("ab8500: Add
devicetree support for btemp") from the battery tree and commit
96ff0f5c7efd ("power: Add simple poweroff-gpio driver") from the arm-soc
tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/power/Kconfig
index 263499f,b1d956d..0000000
--- a/drivers/power/Kconfig
+++ b/drivers/power/Kconfig
@@@ -346,6 -329,15 +346,8 @@@ config AB8500_B
help
Say Y to include support for AB8500 battery management.
-config AB8500_BATTERY_THERM_ON_BATCTRL
- bool "Thermistor connected on BATCTRL ADC"
- depends on AB8500_BM
- help
- Say Y to enable battery temperature measurements using
- thermistor connected on BATCTRL ADC.
-
+ source "drivers/power/reset/Kconfig"
+
endif # POWER_SUPPLY
source "drivers/power/avs/Kconfig"
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the arm-soc tree with the battery tree
2012-11-27 4:52 linux-next: manual merge of the arm-soc tree with the battery tree Stephen Rothwell
@ 2012-11-27 8:38 ` Arnd Bergmann
0 siblings, 0 replies; 2+ messages in thread
From: Arnd Bergmann @ 2012-11-27 8:38 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Andrew Lunn, Jason Cooper, Jamie Lentin, linux-kernel,
linux-next, Rajanikanth H.V, Olof Johansson, Anton Vorontsov,
linux-arm-kernel
On Tuesday 27 November 2012, Stephen Rothwell wrote:
>
> -config AB8500_BATTERY_THERM_ON_BATCTRL
> - bool "Thermistor connected on BATCTRL ADC"
> - depends on AB8500_BM
> - help
> - Say Y to enable battery temperature measurements using
> - thermistor connected on BATCTRL ADC.
> -
> + source "drivers/power/reset/Kconfig"
> +
> endif # POWER_SUPPLY
>
> source "drivers/power/avs/Kconfig"
>
Looks good, thanks!
Arnd
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-11-27 8:38 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-11-27 4:52 linux-next: manual merge of the arm-soc tree with the battery tree Stephen Rothwell
2012-11-27 8:38 ` Arnd Bergmann
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).