Merge remote-tracking branch 'asoc/fix/rt5645' into asoc-linus

[deliverable/linux.git] / drivers / watchdog / at91sam9_wdt.c

diff --git a/drivers/watchdog/at91sam9_wdt.c b/drivers/watchdog/at91sam9_wdt.c
index 1443b3c391de497c05fe332f1c4cdd067bc5f5c9..e4698f7c5f9306826836e7856b7862aa21c593d6 100644 (file)
--- a/drivers/watchdog/at91sam9_wdt.c
+++ b/drivers/watchdog/at91sam9_wdt.c
@@ -40,9 +40,9 @@
 #define DRV_NAME "AT91SAM9 Watchdog"
 
 #define wdt_read(wdt, field) \
-       __raw_readl((wdt)->base + (field))
+       readl_relaxed((wdt)->base + (field))
 #define wdt_write(wtd, field, val) \
-       __raw_writel((val), (wdt)->base + (field))
+       writel_relaxed((val), (wdt)->base + (field))
 
 /* AT91SAM9 watchdog runs a 12bit counter @ 256Hz,
  * use this to convert a watchdog