git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge mainline v2.6.27-rc2 tree into linux-omap tree
[pandora-kernel.git]
/
drivers
/
watchdog
/
Kconfig
diff --git
a/drivers/watchdog/Kconfig
b/drivers/watchdog/Kconfig
index
fb9abfe
..
f363341
100644
(file)
--- a/
drivers/watchdog/Kconfig
+++ b/
drivers/watchdog/Kconfig
@@
-788,8
+788,6
@@
config WATCHDOG_RIO
machines. The watchdog timeout period is normally one minute but
can be changed with a boot-time parameter.
-# V850 Architecture
-
# XTENSA Architecture
#