[kernel] update to 2.6.27.15

[openwrt.git] / target / linux / ar71xx / files / drivers / watchdog / ar71xx_wdt.c

diff --git a/target/linux/ar71xx/files/drivers/watchdog/ar71xx_wdt.c b/target/linux/ar71xx/files/drivers/watchdog/ar71xx_wdt.c
index 9f14ff7..b5bc254 100644 (file)
--- a/target/linux/ar71xx/files/drivers/watchdog/ar71xx_wdt.c
+++ b/target/linux/ar71xx/files/drivers/watchdog/ar71xx_wdt.c
@@ -56,20 +56,20 @@ static int max_timeout;
 
 static void inline ar71xx_wdt_keepalive(void)
 {
 
 static void inline ar71xx_wdt_keepalive(void)
 {

-       ar71xx_reset_wr(RESET_REG_WDOG, ar71xx_ahb_freq * wdt_timeout);
+       ar71xx_reset_wr(AR71XX_RESET_REG_WDOG, ar71xx_ahb_freq * wdt_timeout);

 }
 
 static void inline ar71xx_wdt_enable(void)
 {
        printk(KERN_DEBUG DRV_NAME ": enabling watchdog timer\n");
        ar71xx_wdt_keepalive();
 }
 
 static void inline ar71xx_wdt_enable(void)
 {
        printk(KERN_DEBUG DRV_NAME ": enabling watchdog timer\n");
        ar71xx_wdt_keepalive();

-       ar71xx_reset_wr(RESET_REG_WDOG_CTRL, WDOG_CTRL_ACTION_FCR);
+       ar71xx_reset_wr(AR71XX_RESET_REG_WDOG_CTRL, WDOG_CTRL_ACTION_FCR);

 }
 
 static void inline ar71xx_wdt_disable(void)
 {
        printk(KERN_DEBUG DRV_NAME ": disabling watchdog timer\n");
 }
 
 static void inline ar71xx_wdt_disable(void)
 {
        printk(KERN_DEBUG DRV_NAME ": disabling watchdog timer\n");

-       ar71xx_reset_wr(RESET_REG_WDOG_CTRL, WDOG_CTRL_ACTION_NONE);
+       ar71xx_reset_wr(AR71XX_RESET_REG_WDOG_CTRL, WDOG_CTRL_ACTION_NONE);

 }
 
 static int ar71xx_wdt_set_timeout(int val)
 }
 
 static int ar71xx_wdt_set_timeout(int val)


@@ -216,7 +216,7 @@ static int __devinit ar71xx_wdt_probe(struct platform_device *pdev)
        wdt_timeout = (max_timeout < WDT_TIMEOUT) ? max_timeout : WDT_TIMEOUT;
 
        boot_status =
        wdt_timeout = (max_timeout < WDT_TIMEOUT) ? max_timeout : WDT_TIMEOUT;
 
        boot_status =

-               (ar71xx_reset_rr(RESET_REG_WDOG_CTRL) & WDOG_CTRL_LAST_RESET) ?
+               (ar71xx_reset_rr(AR71XX_RESET_REG_WDOG_CTRL) & WDOG_CTRL_LAST_RESET) ?

                WDIOF_CARDRESET : 0;
 
        ret = misc_register(&ar71xx_wdt_miscdev);
                WDIOF_CARDRESET : 0;
 
        ret = misc_register(&ar71xx_wdt_miscdev);