The following commit has been merged in the linux branch: commit 4726374fb4cc93472b83765ef786d8093e352afa Author: Yegor Yefremov yegorslists@googlemail.com Date: Tue Oct 20 08:39:41 2009 +0100

ARM: 5766/1: Fix watchdog enabling for AT91SAM9G45

The macro for the watchdog has been changed from CONFIG_AT91SAM9_WATCHDOG to CONFIG_AT91SAM9X_WATCHDOG due to AT91CAP9 chips support

Signed-off-by: Yegor Yefremov yegorslists@googlemail.com Acked-by: Andrew Victor linux@maxim.org.za Signed-off-by: Russell King rmk+kernel@arm.linux.org.uk

diff --git a/arch/arm/mach-at91/at91sam9g45_devices.c b/arch/arm/mach-at91/at91sam9g45_devices.c index d581cff..332b784 100644 --- a/arch/arm/mach-at91/at91sam9g45_devices.c +++ b/arch/arm/mach-at91/at91sam9g45_devices.c @@ -838,7 +838,7 @@ static void __init at91_add_device_rtt(void) * Watchdog * -------------------------------------------------------------------- */

-#if defined(CONFIG_AT91SAM9_WATCHDOG) || defined(CONFIG_AT91SAM9_WATCHDOG_MODULE) +#if defined(CONFIG_AT91SAM9X_WATCHDOG) || defined(CONFIG_AT91SAM9X_WATCHDOG_MODULE) static struct platform_device at91sam9g45_wdt_device = { .name = "at91_wdt", .id = -1,