Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...

diff --combined drivers/watchdog/Kconfig
index faa9127aecaad347712449ed5d784b57255b22c1,31649b7b672fa3a8b5e54e7b5dc9591267252f6b..908160e938dc75080fc592d546768ab31bd5d71d
--- 1/drivers/watchdog/Kconfig
--- 2/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@@ -862,12 -862,12 +862,12 @@@ config SBC_EPX_C3_WATCHDO
  
  # M68K Architecture
  
- config M548x_WATCHDOG
-       tristate "MCF548x watchdog support"
+ config M54xx_WATCHDOG
+       tristate "MCF54xx watchdog support"
        depends on M548x
        help
          To compile this driver as a module, choose M here: the
-         module will be called m548x_wdt.
+         module will be called m54xx_wdt.
  
  # MIPS Architecture
  
@@@ -1083,6 -1083,14 +1083,6 @@@ config SH_WD
          To compile this driver as a module, choose M here: the
          module will be called shwdt.
  
 -config SH_WDT_MMAP
 -      bool "Allow mmap of SH WDT"
 -      default n
 -      depends on SH_WDT
 -      help
 -        If you say Y here, user applications will be able to mmap the
 -        WDT/CPG registers.
 -
  # SPARC Architecture
  
  # SPARC64 Architecture