diff --git a/[refs] b/[refs] index 79567c1e5a81..cfaa05a9e220 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: af6882be363d3a7bf0f72dd17ac2a639c4da0059 +refs/heads/master: b64a15930c35c3c1046533aadcfe4f3233e70c20 diff --git a/trunk/drivers/usb/phy/phy-samsung-usb2.c b/trunk/drivers/usb/phy/phy-samsung-usb2.c index dce968151505..45ffe036dacc 100644 --- a/trunk/drivers/usb/phy/phy-samsung-usb2.c +++ b/trunk/drivers/usb/phy/phy-samsung-usb2.c @@ -43,7 +43,7 @@ static int samsung_usbphy_set_host(struct usb_otg *otg, struct usb_bus *host) return 0; } -static bool exynos5_phyhost_is_on(void *regs) +static bool exynos5_phyhost_is_on(void __iomem *regs) { u32 reg;