diff options
| author | Mark Brown <broonie@linaro.org> | 2014-08-20 11:38:37 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-08-20 11:38:37 -0500 |
| commit | 4811ec8cfa2f8d959cee6c7bd99f58f4b6d82a48 (patch) | |
| tree | b9cb61c7ab55718da7cf34897d58b3aca62cf85b /drivers | |
| parent | bfec6da6fbdab63ec020bfa97e770c14b33a6240 (diff) | |
| parent | 2d9add24705f046799859d60fb0d0b5a8eb78073 (diff) | |
Merge branch 'linux-linaro-lsk-v3.14' into linux-linaro-lsk-v3.14-android
Diffstat (limited to 'drivers')
| -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 */ |