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 git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git]
/
arch
/
arm
/
configs
/
qil-a9260_defconfig
diff --git
a/arch/arm/configs/qil-a9260_defconfig
b/arch/arm/configs/qil-a9260_defconfig
index
cd1d717
..
9b32d0e
100644
(file)
--- a/
arch/arm/configs/qil-a9260_defconfig
+++ b/
arch/arm/configs/qil-a9260_defconfig
@@
-727,7
+727,7
@@
CONFIG_WATCHDOG_NOWAYOUT=y
# Watchdog Device Drivers
#
# CONFIG_SOFT_WATCHDOG is not set
-# CONFIG_AT91SAM9_WATCHDOG is not set
+# CONFIG_AT91SAM9
X
_WATCHDOG is not set
#
# USB-based Watchdog Cards