diff options
| author | Mark Brown <broonie@linaro.org> | 2014-08-20 11:38:28 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-08-20 11:38:28 -0500 |
| commit | 85ece70e8256c6c16b80c2808bd97d034d279df6 (patch) | |
| tree | 72d786879395bdcdab588395998e975d9e2eb150 | |
| parent | 150cfc4ee0e6cc8b34ef508936432ef094694261 (diff) | |
| parent | 8637c1da33ee7150c77bfd800d22a993979c4903 (diff) | |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-rt
| -rw-r--r-- | drivers/usb/host/ehci-h20ahb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/host/ehci-h20ahb.c b/drivers/usb/host/ehci-h20ahb.c index 3ee3c7aa6e5b..7724bab1828b 100644 --- a/drivers/usb/host/ehci-h20ahb.c +++ b/drivers/usb/host/ehci-h20ahb.c @@ -58,12 +58,12 @@ struct h20ahb_hcd { static inline void ehci_write(void __iomem *base, u32 reg, u32 val) { - __raw_writel(val, base + reg); + writel_relaxed(val, base + reg); } static inline u32 ehci_read(void __iomem *base, u32 reg) { - return __raw_readl(base + reg); + return readl_relaxed(base + reg); } /* configure so an HC device and id are always provided */ |