diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-06-18 19:03:30 (GMT) |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-06-18 19:05:48 (GMT) |
| commit | b3f288de7c8add67a3364e989b865b6537838662 (patch) | |
| tree | 389c80ae471e4e24f25e6c38862a89ee5d833d86 /drivers/usb/phy/phy-fsl-usb.c | |
| parent | 04e71d72abec3e1a2b2ac10f96ced1a471ecb3aa (diff) | |
| parent | 8d962507007357d6fbbcbdd1647faa389a9aed6d (diff) | |
| download | linux-fsl-qoriq-b3f288de7c8add67a3364e989b865b6537838662.tar.xz | |
Merge branch 'for-rmk/hugepages' of git://git.linaro.org/people/stevecapper/linux into devel-stable
These changes bring both HugeTLB support and Transparent HugePage
(THP) support to ARM. Only long descriptors (LPAE) are supported
in this series.
The code has been tested on an Arndale board (Exynos 5250).
Diffstat (limited to 'drivers/usb/phy/phy-fsl-usb.c')
| -rw-r--r-- | drivers/usb/phy/phy-fsl-usb.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/phy/phy-fsl-usb.c b/drivers/usb/phy/phy-fsl-usb.c index 97b9308..e771baf 100644 --- a/drivers/usb/phy/phy-fsl-usb.c +++ b/drivers/usb/phy/phy-fsl-usb.c @@ -799,6 +799,7 @@ static int fsl_otg_conf(struct platform_device *pdev) /* initialize the otg structure */ fsl_otg_tc->phy.label = DRIVER_DESC; + fsl_otg_tc->phy.dev = &pdev->dev; fsl_otg_tc->phy.set_power = fsl_otg_set_power; fsl_otg_tc->phy.otg->phy = &fsl_otg_tc->phy; |