projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'stable/for-linus-3.12-rc0-tag-two' of git://git.kernel.org/pub/scm/linux...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
watchdog
/
Kconfig
diff --git
a/drivers/watchdog/Kconfig
b/drivers/watchdog/Kconfig
index 8519bc696a6ffa8f47d441cb600926c28ac77a59..362085d7ad8fc1787f234039ecb4b9620237657b 100644
(file)
--- a/
drivers/watchdog/Kconfig
+++ b/
drivers/watchdog/Kconfig
@@
-1074,7
+1074,7
@@
config TXX9_WDT
config OCTEON_WDT
tristate "Cavium OCTEON SOC family Watchdog Timer"
- depends on C
PU_CAVIUM_OCTEON
+ depends on C
AVIUM_OCTEON_SOC
default y
select EXPORT_UASM if OCTEON_WDT = m
help