diff options
| author | David S. Miller <davem@davemloft.net> | 2011-07-06 02:23:37 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-07-06 02:23:37 -0400 |
| commit | e12fe68ce34d60c04bb1ddb1d3cc5c3022388fe4 (patch) | |
| tree | 83c0e192ccaa4752c80b6131a7d0aa8272b5d0d0 /drivers/watchdog/Kconfig | |
| parent | 7329f0d58de01878d9ce4f0be7a76e136f223eef (diff) | |
| parent | 712ae51afd55b20c04c5383d02ba5d10233313b1 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/watchdog/Kconfig')
| -rw-r--r-- | drivers/watchdog/Kconfig | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index 022f9eb0b7bf..9536d386bb38 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig | |||
| @@ -535,8 +535,7 @@ config I6300ESB_WDT | |||
| 535 | 535 | ||
| 536 | config INTEL_SCU_WATCHDOG | 536 | config INTEL_SCU_WATCHDOG |
| 537 | bool "Intel SCU Watchdog for Mobile Platforms" | 537 | bool "Intel SCU Watchdog for Mobile Platforms" |
| 538 | depends on WATCHDOG | 538 | depends on X86_MRST |
| 539 | depends on INTEL_SCU_IPC | ||
| 540 | ---help--- | 539 | ---help--- |
| 541 | Hardware driver for the watchdog time built into the Intel SCU | 540 | Hardware driver for the watchdog time built into the Intel SCU |
| 542 | for Intel Mobile Platforms. | 541 | for Intel Mobile Platforms. |