diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-02-19 06:56:36 -0500 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2011-02-19 06:56:43 -0500 |
| commit | 218502bfe674f570205367b9094048207b04ba15 (patch) | |
| tree | c6187b97e7c79d902aef08f049e9fba04c421d56 /drivers/watchdog/Kconfig | |
| parent | 51327ada7142ab520ed610a42572d1f4cbfbb2dc (diff) | |
| parent | 6d83f94db95cfe65d2a6359cccdf61cf087c2598 (diff) | |
Merge branch 'irq/urgent' into irq/core
Reason: Further patches are conflicting with mainline fixes
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'drivers/watchdog/Kconfig')
| -rw-r--r-- | drivers/watchdog/Kconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index 2e2400e7322e..31649b7b672f 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig | |||
| @@ -862,12 +862,12 @@ config SBC_EPX_C3_WATCHDOG | |||
| 862 | 862 | ||
| 863 | # M68K Architecture | 863 | # M68K Architecture |
| 864 | 864 | ||
| 865 | config M548x_WATCHDOG | 865 | config M54xx_WATCHDOG |
| 866 | tristate "MCF548x watchdog support" | 866 | tristate "MCF54xx watchdog support" |
| 867 | depends on M548x | 867 | depends on M548x |
| 868 | help | 868 | help |
| 869 | To compile this driver as a module, choose M here: the | 869 | To compile this driver as a module, choose M here: the |
| 870 | module will be called m548x_wdt. | 870 | module will be called m54xx_wdt. |
| 871 | 871 | ||
| 872 | # MIPS Architecture | 872 | # MIPS Architecture |
| 873 | 873 | ||