diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-11 07:10:07 +0100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-11 07:10:07 +0100 |
| commit | e14eee56c2280953c6e3d24d5dce42bd90836b81 (patch) | |
| tree | 21ab792d9ad6fbbab460058f352a0158f995644e /arch/arm/configs/at91sam9260ek_defconfig | |
| parent | Merge commit 'gcl/next' into next (diff) | |
| parent | Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/c... (diff) | |
| download | linux-e14eee56c2280953c6e3d24d5dce42bd90836b81.tar.xz linux-e14eee56c2280953c6e3d24d5dce42bd90836b81.zip | |
Merge commit 'origin/master' into next
Diffstat (limited to 'arch/arm/configs/at91sam9260ek_defconfig')
| -rw-r--r-- | arch/arm/configs/at91sam9260ek_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/at91sam9260ek_defconfig b/arch/arm/configs/at91sam9260ek_defconfig index e0ee7060f9aa..98e2f3de4bc5 100644 --- a/arch/arm/configs/at91sam9260ek_defconfig +++ b/arch/arm/configs/at91sam9260ek_defconfig @@ -608,7 +608,7 @@ CONFIG_WATCHDOG_NOWAYOUT=y # Watchdog Device Drivers # # CONFIG_SOFT_WATCHDOG is not set -CONFIG_AT91SAM9_WATCHDOG=y +CONFIG_AT91SAM9X_WATCHDOG=y # # USB-based Watchdog Cards |