mirror of
https://github.com/torvalds/linux.git
synced 2026-06-08 22:52:35 +02:00
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
This commit is contained in:
commit
630d2cd275
|
|
@ -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 */
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user