Hi Wim,

Today's linux-next merge of the watchdog tree got conflicts in
drivers/watchdog/Kconfig and drivers/watchdog/Makefile between commit
699ff59052e7 ("watchdog: Add support for ux500_wdt watchdog") from the
mfd tree and commit 77b709cb6c9d ("watchdog: introduce retu_wdt driver")
from the watchdog 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/watchdog/Kconfig
index 26e1fdb,3cc04ea..0000000
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@@ -364,18 -366,18 +366,30 @@@ config IMX2_WD
  	  To compile this driver as a module, choose M here: the
  	  module will be called imx2_wdt.
  
 +config UX500_WATCHDOG
 +	tristate "ST-Ericsson Ux500 watchdog"
 +	depends on MFD_DB8500_PRCMU
 +	select WATCHDOG_CORE
 +	default y
 +	help
 +	  Say Y here to include Watchdog timer support for the watchdog
 +	  existing in the prcmu of ST-Ericsson Ux500 series platforms.
 +
 +	  To compile this driver as a module, choose M here: the
 +	  module will be called ux500_wdt.
 +
+ config RETU_WATCHDOG
+ 	tristate "Retu watchdog"
+ 	depends on MFD_RETU
+ 	select WATCHDOG_CORE
+ 	help
+ 	  Retu watchdog driver for Nokia Internet Tablets (770, N800,
+ 	  N810). At least on N800 the watchdog cannot be disabled, so
+ 	  this driver is essential and you should enable it.
+ 
+ 	  To compile this driver as a module, choose M here: the
+ 	  module will be called retu_wdt.
+ 
  # AVR32 Architecture
  
  config AT32AP700X_WDT
diff --cc drivers/watchdog/Makefile
index bec86ee,15813d4..0000000
--- a/drivers/watchdog/Makefile
+++ b/drivers/watchdog/Makefile
@@@ -52,7 -52,7 +52,8 @@@ obj-$(CONFIG_STMP3XXX_RTC_WATCHDOG) += 
  obj-$(CONFIG_NUC900_WATCHDOG) += nuc900_wdt.o
  obj-$(CONFIG_TS72XX_WATCHDOG) += ts72xx_wdt.o
  obj-$(CONFIG_IMX2_WDT) += imx2_wdt.o
 +obj-$(CONFIG_UX500_WATCHDOG) += ux500_wdt.o
+ obj-$(CONFIG_RETU_WATCHDOG) += retu_wdt.o
  
  # AVR32 Architecture
  obj-$(CONFIG_AT32AP700X_WDT) += at32ap700x_wdt.o