Merge remote-tracking branch 'watchdog/master'

Conflicts:
	drivers/watchdog/Kconfig
	drivers/watchdog/orion_wdt.c

diff --cc drivers/watchdog/Kconfig
index f1ff408c4b17144a375c8dbbb2c1d2ab28d83fd5,90f950d039c455acb4ef4ce5b52db5f5289feaeb..a3497419496b1a3a45b0b7f7f030aea1bff91cf1
--- 1/drivers/watchdog/Kconfig
--- 2/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@@ -292,7 -301,7 +301,7 @@@ config DAVINCI_WATCHDO
  
  config ORION_WATCHDOG
        tristate "Orion watchdog"
-       depends on ARCH_ORION5X || ARCH_KIRKWOOD || ARCH_DOVE || ARCH_MVEBU
 -      depends on ARCH_ORION5X || ARCH_KIRKWOOD || ARCH_DOVE || MACH_DOVE
++      depends on ARCH_ORION5X || ARCH_KIRKWOOD || ARCH_DOVE || ARCH_MVEBU || MACH_DOVE
        select WATCHDOG_CORE
        help
          Say Y here if to include support for the watchdog timer

diff --cc drivers/watchdog/orion_wdt.c
index 6f9b4c6e9bca6bcbb4990394dc1e2c2ec0ba2c77,498163497c1cc039db45a4f2fdd373b6dbf49d42..9b3c41d1870370860d582f4e8e74cf5a290d54f6
--- 1/drivers/watchdog/orion_wdt.c
--- 2/drivers/watchdog/orion_wdt.c
+++ b/drivers/watchdog/orion_wdt.c
@@@ -18,9 -18,8 +18,8 @@@
  #include <linux/kernel.h>
  #include <linux/platform_device.h>
  #include <linux/watchdog.h>
- #include <linux/init.h>
 +#include <linux/interrupt.h>
  #include <linux/io.h>
 -#include <linux/spinlock.h>
  #include <linux/clk.h>
  #include <linux/err.h>
  #include <linux/of.h>