diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-04-08 07:36:36 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-04-08 07:37:18 -0400 |
| commit | ca7e0c612005937a4a5a75d3fed90459993de65c (patch) | |
| tree | b574fc0f0189b52ffc87ba20c418228db556faa1 /drivers/watchdog/Kconfig | |
| parent | 8141d0050d76e5695011b5ab577ec66fb51a998c (diff) | |
| parent | f5284e7635787224dda1a2bf82a4c56b1c75671f (diff) | |
Merge branch 'linus' into perf/core
Semantic conflict: arch/x86/kernel/cpu/perf_event_intel_ds.c
Merge reason: pick up latest fixes, fix the conflict
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/watchdog/Kconfig')
| -rw-r--r-- | drivers/watchdog/Kconfig | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index bdcdbd53da89..0e8468ffd100 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig | |||
| @@ -55,11 +55,6 @@ config SOFT_WATCHDOG | |||
| 55 | To compile this driver as a module, choose M here: the | 55 | To compile this driver as a module, choose M here: the |
| 56 | module will be called softdog. | 56 | module will be called softdog. |
| 57 | 57 | ||
| 58 | config MAX63XX_WATCHDOG | ||
| 59 | tristate "Max63xx watchdog" | ||
| 60 | help | ||
| 61 | Support for memory mapped max63{69,70,71,72,73,74} watchdog timer. | ||
| 62 | |||
| 63 | config WM831X_WATCHDOG | 58 | config WM831X_WATCHDOG |
| 64 | tristate "WM831x watchdog" | 59 | tristate "WM831x watchdog" |
| 65 | depends on MFD_WM831X | 60 | depends on MFD_WM831X |
| @@ -305,6 +300,12 @@ config TS72XX_WATCHDOG | |||
| 305 | To compile this driver as a module, choose M here: the | 300 | To compile this driver as a module, choose M here: the |
| 306 | module will be called ts72xx_wdt. | 301 | module will be called ts72xx_wdt. |
| 307 | 302 | ||
| 303 | config MAX63XX_WATCHDOG | ||
| 304 | tristate "Max63xx watchdog" | ||
| 305 | depends on ARM | ||
| 306 | help | ||
| 307 | Support for memory mapped max63{69,70,71,72,73,74} watchdog timer. | ||
| 308 | |||
| 308 | # AVR32 Architecture | 309 | # AVR32 Architecture |
| 309 | 310 | ||
| 310 | config AT32AP700X_WDT | 311 | config AT32AP700X_WDT |