projects
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86/asm' into x86/mm
[linux-2.6]
/
arch
/
arm
/
configs
/
at91sam9263ek_defconfig
diff --git
a/arch/arm/configs/at91sam9263ek_defconfig
b/arch/arm/configs/at91sam9263ek_defconfig
index
036a126
..
21599f3
100644
(file)
--- a/
arch/arm/configs/at91sam9263ek_defconfig
+++ b/
arch/arm/configs/at91sam9263ek_defconfig
@@
-710,7
+710,7
@@
CONFIG_WATCHDOG_NOWAYOUT=y
# Watchdog Device Drivers
#
# CONFIG_SOFT_WATCHDOG is not set
-CONFIG_AT91SAM9_WATCHDOG=y
+CONFIG_AT91SAM9
X
_WATCHDOG=y
#
# USB-based Watchdog Cards