diff options
| author | Ingo Molnar <[email protected]> | 2017-04-03 16:36:32 +0200 |
|---|---|---|
| committer | Ingo Molnar <[email protected]> | 2017-04-03 16:36:32 +0200 |
| commit | 7f75540ff2ca84dbac26cf9deeb620cbf5646f5e (patch) | |
| tree | 1eb54748074d3a91f3dd70fb5d4b23bf713f0bd5 /drivers/usb/phy/phy-isp1301.c | |
| parent | 474aeffd88b87746a75583f356183d5c6caa4213 (diff) | |
| parent | a71c9a1c779f2499fb2afc0553e543f18aff6edf (diff) | |
Merge tag 'v4.11-rc5' into x86/mm, to refresh the branch
Signed-off-by: Ingo Molnar <[email protected]>
Diffstat (limited to 'drivers/usb/phy/phy-isp1301.c')
| -rw-r--r-- | drivers/usb/phy/phy-isp1301.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/phy/phy-isp1301.c b/drivers/usb/phy/phy-isp1301.c index b3b33cf7ddf6..f333024660b4 100644 --- a/drivers/usb/phy/phy-isp1301.c +++ b/drivers/usb/phy/phy-isp1301.c @@ -136,7 +136,7 @@ static int isp1301_remove(struct i2c_client *client) static struct i2c_driver isp1301_driver = { .driver = { .name = DRV_NAME, - .of_match_table = of_match_ptr(isp1301_of_match), + .of_match_table = isp1301_of_match, }, .probe = isp1301_probe, .remove = isp1301_remove, |