diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-13 13:44:08 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-13 13:44:08 +0200 |
| commit | 05d715df3ac052fb41a5ab42369d05a3e2a82de3 (patch) | |
| tree | e99502f671b83f6898a77b78f88fdc67be8aa251 /target/linux/config/Config.in.watchdog | |
| parent | e251f8299bf34e329613e68116d47e124192bc84 (diff) | |
resolve merge conflict
Diffstat (limited to 'target/linux/config/Config.in.watchdog')
| -rw-r--r-- | target/linux/config/Config.in.watchdog | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/config/Config.in.watchdog b/target/linux/config/Config.in.watchdog index 1ce7e5ac8..d8cc5932e 100644 --- a/target/linux/config/Config.in.watchdog +++ b/target/linux/config/Config.in.watchdog @@ -72,7 +72,7 @@ config ADK_KERNEL_RC32434_WDT Support for the hardware watchdog inside Routerboard 532's SoC, the IDT RC32434. -config ADK_KPACKAGE_KMOD_SOFT_WATCHDOG +config ADK_KERNEL_SOFT_WATCHDOG prompt "Software watchdog" tristate default n |