Merge branch 'master' of git://www.denx.de/git/u-boot-mpc85xx

[karo-tx-uboot.git] / drivers / watchdog / at91sam9_wdt.c

diff --git a/drivers/watchdog/at91sam9_wdt.c b/drivers/watchdog/at91sam9_wdt.c
index 25afae748d611cdb47123899ed2d693b1de279ad..80dad07d84eed751905341cf6a2833b215b288c8 100644 (file)
--- a/drivers/watchdog/at91sam9_wdt.c
+++ b/drivers/watchdog/at91sam9_wdt.c
@@ -21,7 +21,7 @@
 #include <common.h>
 #include <watchdog.h>
 #include <asm/arch/hardware.h>
-#include <asm/arch/io.h>
+#include <asm/io.h>
 #include <asm/arch/at91_wdt.h>
 
 /*
@@ -42,7 +42,7 @@
 static int at91_wdt_settimeout(unsigned int timeout)
 {
        unsigned int reg;
-       at91_wdt_t *wd  = (at91_wdt_t *) AT91_WDT_BASE;
+       at91_wdt_t *wd = (at91_wdt_t *) ATMEL_BASE_WDT;
 
        /* Check if disabled */
        if (readl(&wd->mr) & AT91_WDT_MR_WDDIS) {
@@ -69,7 +69,7 @@ static int at91_wdt_settimeout(unsigned int timeout)
 
 void hw_watchdog_reset(void)
 {
-       at91_wdt_t *wd  = (at91_wdt_t *) AT91_WDT_BASE;
+       at91_wdt_t *wd = (at91_wdt_t *) ATMEL_BASE_WDT;
        writel(AT91_WDT_CR_WDRSTT | AT91_WDT_CR_KEY, &wd->cr);
 }