* linux-next: manual merge of the pinctrl tree with the watchdog tree
@ 2014-01-17 5:18 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2014-01-17 5:18 UTC (permalink / raw)
To: Linus Walleij, Wim Van Sebroeck
Cc: linux-next, linux-kernel, Sherman Yin, Markus Mayer
[-- Attachment #1: Type: text/plain, Size: 840 bytes --]
Hi Linus,
Today's linux-next merge of the pinctrl tree got a conflict in
arch/arm/configs/bcm_defconfig between commit bd90ccd42c5d ("watchdog:
bcm281xx: Watchdog Driver") from the watchdog tree and commit
54b1aa5a5b16 ("ARM: pinctrl: Add Broadcom Capri pinctrl driver") from the
pinctrl 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 arch/arm/configs/bcm_defconfig
index 176e842308a8,bede51171d98..000000000000
--- a/arch/arm/configs/bcm_defconfig
+++ b/arch/arm/configs/bcm_defconfig
@@@ -125,6 -126,4 +125,7 @@@ CONFIG_CRC_ITU_T=
CONFIG_CRC7=y
CONFIG_XZ_DEC=y
CONFIG_AVERAGE=y
+CONFIG_WATCHDOG=y
+CONFIG_BCM_KONA_WDT=y
+CONFIG_BCM_KONA_WDT_DEBUG=y
+ CONFIG_PINCTRL_CAPRI=y
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2014-01-17 5:18 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-01-17 5:18 linux-next: manual merge of the pinctrl tree with the watchdog tree Stephen Rothwell
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).