diff options
| author | Mark Brown <broonie@linaro.org> | 2014-08-20 11:35:00 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-08-20 11:35:00 -0500 |
| commit | 8637c1da33ee7150c77bfd800d22a993979c4903 (patch) | |
| tree | de27480f9e43a97ce02c9f652a2afcc3a53fb896 | |
| parent | c01e5d4a6191e485b70eb3f13a10858db7d8990e (diff) | |
| parent | c0964a59ad8b55def7f6dbdb0d1b68fddd131226 (diff) | |
Merge remote-tracking branch 'lsk/v3.10/topic/usb' into linux-linaro-lsk
| -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 */ |