Merge remote-tracking branch 'sparc/master'

diff --combined drivers/watchdog/Kconfig
index 0f6d8515ba4f1d06144bb67c12ef26ef4a545da8,30d38ae685f64019403c045ff08969cef2ccd567..80825a7e8e48e1ebd06af14a1bcf208acb733daf
--- 1/drivers/watchdog/Kconfig
--- 2/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@@ -145,8 -145,7 +145,8 @@@ config MENF21BMC_WATCHDO
  config TANGOX_WATCHDOG
        tristate "Sigma Designs SMP86xx/SMP87xx watchdog"
        select WATCHDOG_CORE
 -      depends on ARCH_TANGOX || COMPILE_TEST
 +      depends on ARCH_TANGO || COMPILE_TEST
 +      depends on HAS_IOMEM
        help
          Support for the watchdog in Sigma Designs SMP86xx (tango3)
          and SMP87xx (tango4) family chips.
@@@ -619,7 -618,6 +619,7 @@@ config DIGICOLOR_WATCHDO
  config LPC18XX_WATCHDOG
        tristate "LPC18xx/43xx Watchdog"
        depends on ARCH_LPC18XX || COMPILE_TEST
 +      depends on HAS_IOMEM
        select WATCHDOG_CORE
        help
          Say Y here if to include support for the watchdog timer
@@@ -1376,7 -1374,6 +1376,7 @@@ config BCM_KONA_WDT_DEBU
  config BCM7038_WDT
        tristate "BCM7038 Watchdog"
        select WATCHDOG_CORE
 +      depends on HAS_IOMEM
        help
         Watchdog driver for the built-in hardware in Broadcom 7038 SoCs.
  
@@@ -1386,7 -1383,6 +1386,7 @@@ config IMGPDC_WD
        tristate "Imagination Technologies PDC Watchdog Timer"
        depends on HAS_IOMEM
        depends on METAG || MIPS || COMPILE_TEST
 +      select WATCHDOG_CORE
        help
          Driver for Imagination Technologies PowerDown Controller
          Watchdog Timer.
@@@ -1569,6 -1565,17 +1569,17 @@@ config WATCHDOG_RI
          machines.  The watchdog timeout period is normally one minute but
          can be changed with a boot-time parameter.
  
+ config WATCHDOG_SUN4V
+       tristate "Sun4v Watchdog support"
+       select WATCHDOG_CORE
+       depends on SPARC64
+       help
+         Say Y here to support the hypervisor watchdog capability embedded
+         in the SPARC sun4v architecture.
+ 
+         To compile this driver as a module, choose M here. The module will
+         be called sun4v_wdt.
+ 
  # XTENSA Architecture
  
  # Xen Architecture